Unverified Commit 7a95a894 authored by Tristan Ross's avatar Tristan Ross Committed by GitHub
Browse files

Merge pull request #324155 from paparodeo/x64-sdk11-no-rebuilds 

treewide: change various flags to allow x64 darwin to default to sdk 11.0 when ready
parents 5a82f82c d44ffe57

pkgs/development/compilers/llvm/13/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -236,8 +236,7 @@ in let 
        # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132

        ++ lib.optional (

          stdenv.targetPlatform.isDarwin

            && !stdenv.targetPlatform.isAarch64

            && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0")

            && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0"

        ) ./lldb/cpu_subtype_arm64e_replacement.patch;

    };

pkgs/development/compilers/llvm/14/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -208,8 +208,7 @@ in let 
        # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132

        ++ lib.optional (

          stdenv.targetPlatform.isDarwin

            && !stdenv.targetPlatform.isAarch64

            && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0")

            && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0"

        ) ./lldb/cpu_subtype_arm64e_replacement.patch;

    };

pkgs/development/compilers/llvm/15/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -250,8 +250,7 @@ in let 
        # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132

        ++ lib.optional (

          stdenv.targetPlatform.isDarwin

            && !stdenv.targetPlatform.isAarch64

            && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0")

            && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0"

        ) ./lldb/cpu_subtype_arm64e_replacement.patch;

    };

pkgs/development/compilers/llvm/16/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -251,8 +251,7 @@ in let 
        # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132

        ++ lib.optional (

          stdenv.targetPlatform.isDarwin

            && !stdenv.targetPlatform.isAarch64

            && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0")

            && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0"

        ) ./lldb/cpu_subtype_arm64e_replacement.patch;

    };

pkgs/development/compilers/llvm/17/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -243,8 +243,7 @@ in let 
        # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132

        ++ lib.optional (

          stdenv.targetPlatform.isDarwin

            && !stdenv.targetPlatform.isAarch64

            && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0")

            && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0"

        ) ./lldb/cpu_subtype_arm64e_replacement.patch;

    };