commit fb91bfc380dfe36ceb07960abeeae8f934c2c986 · pyrox.dev/nixpkgs

+6 -6

pkgs/development/compilers/llvm/11/compiler-rt/default.nix

···

       1
       1
       -
       { lib, stdenv, llvm_meta, version, fetch, cmake, python3, libllvm, libcxxabi }:

     

       1
       1
       +
       { lib, stdenv, llvm_meta, version, fetch, cmake, python3, xcbuild, libllvm, libcxxabi }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
       

     
···

       15
       15
        
         inherit version;

     

       16
       16
        
         src = fetch "compiler-rt" "0x1j8ngf1zj63wlnns9vlibafq48qcm72p4jpaxkmkb4qw0grwfy";

     

       17
       17
        
       

     

       18
       18
       -
         nativeBuildInputs = [ cmake python3 libllvm.dev ];

     

       18
       18
       +
         nativeBuildInputs = [ cmake python3 libllvm.dev ]

     

       19
       19
       +
            ++ lib.optional stdenv.isDarwin xcbuild.xcrun;

     

       19
       20
        
       

     

       20
       21
        
         NIX_CFLAGS_COMPILE = [

     

       21
       22
        
           "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"

     
···

       59
       60
        
           # extra `/`.

     

       60
       61
        
           ./normalize-var.patch

     

       61
       62
        
           ../../common/compiler-rt/libsanitizer-no-cyclades-11.patch

     

       62
       62
       -
         ] ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;

     

       63
       63
       -
       

     

       63
       63
       +
           ../../common/compiler-rt/darwin-plistbuddy-workaround.patch

     

       64
       64
       +
           ./armv7l.patch

     

       65
       65
       +
         ];

     

       64
       66
        
       

     

       65
       67
        
         preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       66
       68
        
           cmakeFlagsArray+=("-DCMAKE_LIPO=$(command -v ${stdenv.cc.targetPrefix}lipo)")

     
···

       75
       77
        
           substituteInPlace cmake/builtin-config-ix.cmake \

     

       76
       78
        
             --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'

     

       77
       79
        
         '' + lib.optionalString stdenv.isDarwin ''

     

       78
       78
       -
           substituteInPlace cmake/builtin-config-ix.cmake \

     

       79
       79
       -
             --replace 'foreach(arch ''${ARM64})' 'foreach(arch)'

     

       80
       80
        
           substituteInPlace cmake/config-ix.cmake \

     

       81
       81
        
             --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'

     

       82
       82
        
         '' + lib.optionalString (useLLVM) ''

+6 -5

pkgs/development/compilers/llvm/12/compiler-rt/default.nix

···

       1
       1
       -
       { lib, stdenv, llvm_meta, version, fetch, cmake, python3, libllvm, libcxxabi }:

     

       1
       1
       +
       { lib, stdenv, llvm_meta, version, fetch, cmake, python3, xcbuild, libllvm, libcxxabi }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
       

     
···

       14
       14
        
         inherit version;

     

       15
       15
        
         src = fetch "compiler-rt" "1950rg294izdwkaasi7yjrmadc9mzdd5paf0q63jjcq2m3rdbj5l";

     

       16
       16
        
       

     

       17
       17
       -
         nativeBuildInputs = [ cmake python3 libllvm.dev ];

     

       17
       17
       +
         nativeBuildInputs = [ cmake python3 libllvm.dev ]

     

       18
       18
       +
           ++ lib.optional stdenv.isDarwin xcbuild.xcrun;

     

       18
       19
        
         buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;

     

       19
       20
        
       

     

       20
       21
        
         NIX_CFLAGS_COMPILE = [

     
···

       59
       60
        
           # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the

     

       60
       61
        
           # extra `/`.

     

       61
       62
        
           ./normalize-var.patch

     

       62
       62
       -
         ] ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;

     

       63
       63
       +
           ../../common/compiler-rt/darwin-plistbuddy-workaround.patch

     

       64
       64
       +
           ./armv7l.patch

     

       65
       65
       +
         ];

     

       63
       66
        
       

     

       64
       67
        
         # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks

     

       65
       68
        
         # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra

     
···

       70
       73
        
           substituteInPlace cmake/builtin-config-ix.cmake \

     

       71
       74
        
             --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'

     

       72
       75
        
         '' + lib.optionalString stdenv.isDarwin ''

     

       73
       73
       -
           substituteInPlace cmake/builtin-config-ix.cmake \

     

       74
       74
       -
             --replace 'set(ARM64 arm64 arm64e)' 'set(ARM64)'

     

       75
       76
        
           substituteInPlace cmake/config-ix.cmake \

     

       76
       77
        
             --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'

     

       77
       78
        
         '' + lib.optionalString (useLLVM) ''

+8 -7

pkgs/development/compilers/llvm/13/compiler-rt/default.nix

···

       1
       1
       -
       { lib, stdenv, llvm_meta, version, src, cmake, python3, libllvm, libcxxabi }:

     

       1
       1
       +
       { lib, stdenv, llvm_meta, version, src, cmake, python3, xcbuild, libllvm, libcxxabi }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
       

     
···

       16
       16
        
         inherit src;

     

       17
       17
        
         sourceRoot = "source/compiler-rt";

     

       18
       18
        
       

     

       19
       19
       -
         nativeBuildInputs = [ cmake python3 libllvm.dev ];

     

       19
       19
       +
         nativeBuildInputs = [ cmake python3 libllvm.dev ]

     

       20
       20
       +
           ++ lib.optional stdenv.isDarwin xcbuild.xcrun;

     

       20
       21
        
         buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;

     

       21
       22
        
       

     

       22
       23
        
         NIX_CFLAGS_COMPILE = [

     
···

       62
       63
        
           # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the

     

       63
       64
        
           # extra `/`.

     

       64
       65
        
           ./normalize-var.patch

     

       65
       65
       -
         ] # Prevent a compilation error on darwin

     

       66
       66
       -
           ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-targetconditionals.patch

     

       67
       67
       -
           ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;

     

       66
       66
       +
           # Prevent a compilation error on darwin

     

       67
       67
       +
           ./darwin-targetconditionals.patch

     

       68
       68
       +
           ../../common/compiler-rt/darwin-plistbuddy-workaround.patch

     

       69
       69
       +
           ./armv7l.patch

     

       70
       70
       +
         ];

     

       68
       71
        
       

     

       69
       72
        
         # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks

     

       70
       73
        
         # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra

     
···

       75
       78
        
           substituteInPlace cmake/builtin-config-ix.cmake \

     

       76
       79
        
             --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'

     

       77
       80
        
         '' + lib.optionalString stdenv.isDarwin ''

     

       78
       78
       -
           substituteInPlace cmake/builtin-config-ix.cmake \

     

       79
       79
       -
             --replace 'set(ARM64 arm64 arm64e)' 'set(ARM64)'

     

       80
       81
        
           substituteInPlace cmake/config-ix.cmake \

     

       81
       82
        
             --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'

     

       82
       83
        
         '' + lib.optionalString (useLLVM) ''

+8 -7

pkgs/development/compilers/llvm/14/compiler-rt/default.nix

···

       1
       1
        
       { lib, stdenv, llvm_meta, version

     

       2
       2
        
       , monorepoSrc, runCommand

     

       3
       3
       -
       , cmake, python3, libllvm, libcxxabi

     

       3
       3
       +
       , cmake, python3, xcbuild, libllvm, libcxxabi

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       let

     
···

       26
       26
        
         inherit src;

     

       27
       27
        
         sourceRoot = "${src.name}/${baseName}";

     

       28
       28
        
       

     

       29
       29
       -
         nativeBuildInputs = [ cmake python3 libllvm.dev ];

     

       29
       29
       +
         nativeBuildInputs = [ cmake python3 libllvm.dev ]

     

       30
       30
       +
           ++ lib.optional stdenv.isDarwin xcbuild.xcrun;

     

       30
       31
        
         buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;

     

       31
       32
        
       

     

       32
       33
        
         NIX_CFLAGS_COMPILE = [

     
···

       72
       73
        
           # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the

     

       73
       74
        
           # extra `/`.

     

       74
       75
        
           ./normalize-var.patch

     

       75
       75
       -
         ] # Prevent a compilation error on darwin

     

       76
       76
       -
           ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-targetconditionals.patch

     

       77
       77
       -
           ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;

     

       76
       76
       +
           # Prevent a compilation error on darwin

     

       77
       77
       +
           ./darwin-targetconditionals.patch

     

       78
       78
       +
           ../../common/compiler-rt/darwin-plistbuddy-workaround.patch

     

       79
       79
       +
           ./armv7l.patch

     

       80
       80
       +
         ];

     

       78
       81
        
       

     

       79
       82
        
         # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks

     

       80
       83
        
         # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra

     
···

       85
       88
        
           substituteInPlace cmake/builtin-config-ix.cmake \

     

       86
       89
        
             --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'

     

       87
       90
        
         '' + lib.optionalString stdenv.isDarwin ''

     

       88
       88
       -
           substituteInPlace cmake/builtin-config-ix.cmake \

     

       89
       89
       -
             --replace 'set(ARM64 arm64 arm64e)' 'set(ARM64)'

     

       90
       91
        
           substituteInPlace cmake/config-ix.cmake \

     

       91
       92
        
             --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'

     

       92
       93
        
         '' + lib.optionalString (useLLVM) ''

+25

pkgs/development/compilers/llvm/common/compiler-rt/darwin-plistbuddy-workaround.patch

···

       1
       1
       +
       CMake tries to read a list field from SDKSettings.plist, but the output of

     

       2
       2
       +
       xcbuild PlistBuddy is incompatible with Apple's. (Plus we don't want it in our

     

       3
       3
       +
       dependencies.)

     

       4
       4
       +
       

     

       5
       5
       +
       Simply assume ARM64 is supported by the SDK. We already limit the actual archs

     

       6
       6
       +
       we build for by setting DARWIN_osx_BUILTIN_ARCHS explicitely.

     

       7
       7
       +
       

     

       8
       8
       +
       --- a/cmake/builtin-config-ix.cmake

     

       9
       9
       +
       +++ b/cmake/builtin-config-ix.cmake

     

       10
       10
       +
       @@ -97,14 +97,7 @@ if(APPLE)

     

       11
       11
       +
          set(DARWIN_osx_BUILTIN_MIN_VER 10.5)

     

       12
       12
       +
          set(DARWIN_osx_BUILTIN_MIN_VER_FLAG

     

       13
       13
       +
              -mmacosx-version-min=${DARWIN_osx_BUILTIN_MIN_VER})

     

       14
       14
       +
       -  set(DARWIN_osx_BUILTIN_ALL_POSSIBLE_ARCHS ${X86} ${X86_64})

     

       15
       15
       +
       -  # Add support for arm64 macOS if available in SDK.

     

       16
       16
       +
       -  foreach(arch ${ARM64})

     

       17
       17
       +
       -    sdk_has_arch_support(${DARWIN_osx_SYSROOT} macosx ${arch} MACOS_ARM_SUPPORT)

     

       18
       18
       +
       -    if (MACOS_ARM_SUPPORT)

     

       19
       19
       +
       -     list(APPEND DARWIN_osx_BUILTIN_ALL_POSSIBLE_ARCHS ${arch})

     

       20
       20
       +
       -    endif()

     

       21
       21
       +
       -  endforeach(arch)

     

       22
       22
       +
       +  set(DARWIN_osx_BUILTIN_ALL_POSSIBLE_ARCHS ${X86} ${X86_64} ${ARM64})

     

       23
       23
       +
        

     

       24
       24
       +
          if(COMPILER_RT_ENABLE_IOS)

     

       25
       25
       +
            list(APPEND DARWIN_EMBEDDED_PLATFORMS ios)

+8 -7

pkgs/development/compilers/llvm/git/compiler-rt/default.nix

···

       1
       1
        
       { lib, stdenv, llvm_meta, version

     

       2
       2
        
       , monorepoSrc, runCommand

     

       3
       3
       -
       , cmake, python3, libllvm, libcxxabi

     

       3
       3
       +
       , cmake, python3, xcbuild, libllvm, libcxxabi

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       let

     
···

       26
       26
        
         inherit src;

     

       27
       27
        
         sourceRoot = "${src.name}/${baseName}";

     

       28
       28
        
       

     

       29
       29
       -
         nativeBuildInputs = [ cmake python3 libllvm.dev ];

     

       29
       29
       +
         nativeBuildInputs = [ cmake python3 libllvm.dev ]

     

       30
       30
       +
           ++ lib.optional stdenv.isDarwin xcbuild.xcrun;

     

       30
       31
        
         buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;

     

       31
       32
        
       

     

       32
       33
        
         NIX_CFLAGS_COMPILE = [

     
···

       72
       73
        
           # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the

     

       73
       74
        
           # extra `/`.

     

       74
       75
        
           ./normalize-var.patch

     

       75
       75
       -
         ] # Prevent a compilation error on darwin

     

       76
       76
       -
           ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-targetconditionals.patch

     

       77
       77
       -
           ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;

     

       76
       76
       +
           # Prevent a compilation error on darwin

     

       77
       77
       +
           ./darwin-targetconditionals.patch

     

       78
       78
       +
           ../../common/compiler-rt/darwin-plistbuddy-workaround.patch

     

       79
       79
       +
           ./armv7l.patch

     

       80
       80
       +
         ];

     

       78
       81
        
       

     

       79
       82
        
         # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks

     

       80
       83
        
         # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra

     
···

       85
       88
        
           substituteInPlace cmake/builtin-config-ix.cmake \

     

       86
       89
        
             --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'

     

       87
       90
        
         '' + lib.optionalString stdenv.isDarwin ''

     

       88
       88
       -
           substituteInPlace cmake/builtin-config-ix.cmake \

     

       89
       89
       -
             --replace 'set(ARM64 arm64 arm64e)' 'set(ARM64)'

     

       90
       91
        
           substituteInPlace cmake/config-ix.cmake \

     

       91
       92
        
             --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'

     

       92
       93
        
         '' + lib.optionalString (useLLVM) ''