commit bd1607202d4befa0c17ba323d1ed985291bb157e · pyrox.dev/nixpkgs

+1 -1

pkgs/development/compilers/llvm/11/clang/default.nix

···

       50
       50
        
             # https://reviews.llvm.org/D51899

     

       51
       51
        
             ./gnu-install-dirs.patch

     

       52
       52
        
             (substituteAll {

     

       53
       53
       -
               src = ../../clang-11-15-LLVMgold-path.patch;

     

       53
       53
       +
               src = ../../common/clang/clang-11-15-LLVMgold-path.patch;

     

       54
       54
        
               libllvmLibdir = "${libllvm.lib}/lib";

     

       55
       55
        
             })

     

       56
       56
        
           ];

+1 -1

pkgs/development/compilers/llvm/11/libcxx/default.nix

···

       30
       30
        
           })

     

       31
       31
        
           ./gnu-install-dirs.patch

     

       32
       32
        
         ] ++ lib.optionals stdenv.hostPlatform.isMusl [

     

       33
       33
       -
           ../../libcxx-0001-musl-hacks.patch

     

       33
       33
       +
           ../../common/libcxx/libcxx-0001-musl-hacks.patch

     

       34
       34
        
         ];

     

       35
       35
        
       

     

       36
       36
        
         # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz"

+1 -1

pkgs/development/compilers/llvm/11/libcxxabi/default.nix

···

       20
       20
        
         '' + lib.optionalString stdenv.isDarwin ''

     

       21
       21
        
           export TRIPLE=x86_64-apple-darwin

     

       22
       22
        
         '' + lib.optionalString stdenv.hostPlatform.isMusl ''

     

       23
       23
       -
           patch -p1 -d libcxx -i ${../../libcxx-0001-musl-hacks.patch}

     

       23
       23
       +
           patch -p1 -d libcxx -i ${../../common/libcxx/libcxx-0001-musl-hacks.patch}

     

       24
       24
        
         '' + lib.optionalString stdenv.hostPlatform.isWasm ''

     

       25
       25
        
           patch -p1 -d llvm -i ${../../common/libcxxabi/wasm.patch}

     

       26
       26
        
         '';

+2 -2

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

···

       86
       86
        
           # of the flags used for the normal LLVM build. To avoid the need for building

     

       87
       87
        
           # a native libLLVM.so (which would fail) we force llvm-config to be linked

     

       88
       88
        
           # statically against the necessary LLVM components always.

     

       89
       89
       -
           ../../llvm-config-link-static.patch

     

       89
       89
       +
           ../../common/llvm/llvm-config-link-static.patch

     

       90
       90
        
       

     

       91
       91
        
           ./gnu-install-dirs.patch

     

       92
       92
        
           # On older CPUs (e.g. Hydra/wendy) we'd be getting an error in this test.

     
···

       149
       149
        
             --replace "Path.cpp" ""

     

       150
       150
        
           rm unittests/Support/Path.cpp

     

       151
       151
        
         '' + optionalString stdenv.hostPlatform.isMusl ''

     

       152
       152
       -
           patch -p1 -i ${../../TLI-musl.patch}

     

       152
       152
       +
           patch -p1 -i ${../../common/llvm/TLI-musl.patch}

     

       153
       153
        
           substituteInPlace unittests/Support/CMakeLists.txt \

     

       154
       154
        
             --replace "add_subdirectory(DynamicLibrary)" ""

     

       155
       155
        
           rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp

+1 -1

pkgs/development/compilers/llvm/12/clang/default.nix

···

       47
       47
        
             # https://reviews.llvm.org/D51899

     

       48
       48
        
             ./gnu-install-dirs.patch

     

       49
       49
        
             (substituteAll {

     

       50
       50
       -
               src = ../../clang-11-15-LLVMgold-path.patch;

     

       50
       50
       +
               src = ../../common/clang/clang-11-15-LLVMgold-path.patch;

     

       51
       51
        
               libllvmLibdir = "${libllvm.lib}/lib";

     

       52
       52
        
             })

     

       53
       53
        
           ];

+1 -1

pkgs/development/compilers/llvm/12/libcxx/default.nix

···

       24
       24
        
         patches = [

     

       25
       25
        
           ./gnu-install-dirs.patch

     

       26
       26
        
         ] ++ lib.optionals stdenv.hostPlatform.isMusl [

     

       27
       27
       -
           ../../libcxx-0001-musl-hacks.patch

     

       27
       27
       +
           ../../common/libcxx/libcxx-0001-musl-hacks.patch

     

       28
       28
        
         ];

     

       29
       29
        
       

     

       30
       30
        
         preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''

+1 -1

pkgs/development/compilers/llvm/12/libcxxabi/default.nix

···

       20
       20
        
         '' + lib.optionalString stdenv.isDarwin ''

     

       21
       21
        
           export TRIPLE=x86_64-apple-darwin

     

       22
       22
        
         '' + lib.optionalString stdenv.hostPlatform.isMusl ''

     

       23
       23
       -
           patch -p1 -d libcxx -i ${../../libcxx-0001-musl-hacks.patch}

     

       23
       23
       +
           patch -p1 -d libcxx -i ${../../common/libcxx/libcxx-0001-musl-hacks.patch}

     

       24
       24
        
         '' + lib.optionalString stdenv.hostPlatform.isWasm ''

     

       25
       25
        
           patch -p1 -d llvm -i ${../../common/libcxxabi/wasm.patch}

     

       26
       26
        
         '';

+2 -2

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

···

       87
       87
        
           # of the flags used for the normal LLVM build. To avoid the need for building

     

       88
       88
        
           # a native libLLVM.so (which would fail) we force llvm-config to be linked

     

       89
       89
        
           # statically against the necessary LLVM components always.

     

       90
       90
       -
           ../../llvm-config-link-static.patch

     

       90
       90
       +
           ../../common/llvm/llvm-config-link-static.patch

     

       91
       91
        
           # Fix llvm being miscompiled by some gccs. See llvm/llvm-project#49955

     

       92
       92
        
           # Fix llvm being miscompiled by some gccs. See https://github.com/llvm/llvm-project/issues/49955

     

       93
       93
        
           ./fix-llvm-issue-49955.patch

     
···

       138
       138
        
           # TODO: Fix failing tests:

     

       139
       139
        
           rm test/DebugInfo/X86/vla-multi.ll

     

       140
       140
        
         '' + optionalString stdenv.hostPlatform.isMusl ''

     

       141
       141
       -
           patch -p1 -i ${../../TLI-musl.patch}

     

       141
       141
       +
           patch -p1 -i ${../../common/llvm/TLI-musl.patch}

     

       142
       142
        
           substituteInPlace unittests/Support/CMakeLists.txt \

     

       143
       143
        
             --replace "add_subdirectory(DynamicLibrary)" ""

     

       144
       144
        
           rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp

+1 -1

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

···

       43
       43
        
             ./revert-malloc-alignment-assumption.patch

     

       44
       44
        
             ../../common/clang/add-nostdlibinc-flag.patch

     

       45
       45
        
             (substituteAll {

     

       46
       46
       -
               src = ../../clang-11-15-LLVMgold-path.patch;

     

       46
       46
       +
               src = ../../common/clang/clang-11-15-LLVMgold-path.patch;

     

       47
       47
        
               libllvmLibdir = "${libllvm.lib}/lib";

     

       48
       48
        
             })

     

       49
       49
        
           ];

+1 -1

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

···

       25
       25
        
         patches = [

     

       26
       26
        
           ./gnu-install-dirs.patch

     

       27
       27
        
         ] ++ lib.optionals stdenv.hostPlatform.isMusl [

     

       28
       28
       -
           ../../libcxx-0001-musl-hacks.patch

     

       28
       28
       +
           ../../common/libcxx/libcxx-0001-musl-hacks.patch

     

       29
       29
        
         ];

     

       30
       30
        
       

     

       31
       31
        
         preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''

+2 -2

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

···

       81
       81
        
           # of the flags used for the normal LLVM build. To avoid the need for building

     

       82
       82
        
           # a native libLLVM.so (which would fail) we force llvm-config to be linked

     

       83
       83
        
           # statically against the necessary LLVM components always.

     

       84
       84
       -
           ../../llvm-config-link-static.patch

     

       84
       84
       +
           ../../common/llvm/llvm-config-link-static.patch

     

       85
       85
        
       

     

       86
       86
        
           ./gnu-install-dirs.patch

     

       87
       87
        
       

     
···

       128
       128
        
           rm unittests/IR/PassBuilderCallbacksTest.cpp

     

       129
       129
        
           rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test

     

       130
       130
        
         '' + optionalString stdenv.hostPlatform.isMusl ''

     

       131
       131
       -
           patch -p1 -i ${../../TLI-musl.patch}

     

       131
       131
       +
           patch -p1 -i ${../../common/llvm/TLI-musl.patch}

     

       132
       132
        
           substituteInPlace unittests/Support/CMakeLists.txt \

     

       133
       133
        
             --replace "add_subdirectory(DynamicLibrary)" ""

     

       134
       134
        
           rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp

+1 -1

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

···

       46
       46
        
             ./gnu-install-dirs.patch

     

       47
       47
        
             ../../common/clang/add-nostdlibinc-flag.patch

     

       48
       48
        
             (substituteAll {

     

       49
       49
       -
               src = ../../clang-11-15-LLVMgold-path.patch;

     

       49
       49
       +
               src = ../../common/clang/clang-11-15-LLVMgold-path.patch;

     

       50
       50
        
               libllvmLibdir = "${libllvm.lib}/lib";

     

       51
       51
        
             })

     

       52
       52
        
           ];

+1 -1

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

···

       41
       41
        
         patches = [

     

       42
       42
        
           ./gnu-install-dirs.patch

     

       43
       43
        
         ] ++ lib.optionals stdenv.hostPlatform.isMusl [

     

       44
       44
       -
           ../../libcxx-0001-musl-hacks.patch

     

       44
       44
       +
           ../../common/libcxx/libcxx-0001-musl-hacks.patch

     

       45
       45
        
         ];

     

       46
       46
        
       

     

       47
       47
        
         preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''

+1 -1

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

···

       110
       110
        
           rm unittests/IR/PassBuilderCallbacksTest.cpp

     

       111
       111
        
           rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test

     

       112
       112
        
         '' + optionalString stdenv.hostPlatform.isMusl ''

     

       113
       113
       -
           patch -p1 -i ${../../TLI-musl.patch}

     

       113
       113
       +
           patch -p1 -i ${../../common/llvm/TLI-musl.patch}

     

       114
       114
        
           substituteInPlace unittests/Support/CMakeLists.txt \

     

       115
       115
        
             --replace "add_subdirectory(DynamicLibrary)" ""

     

       116
       116
        
           rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp

+1 -1

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

···

       52
       52
        
             ./gnu-install-dirs.patch

     

       53
       53
        
             ../../common/clang/add-nostdlibinc-flag.patch

     

       54
       54
        
             (substituteAll {

     

       55
       55
       -
               src = ../../clang-11-15-LLVMgold-path.patch;

     

       55
       55
       +
               src = ../../common/clang/clang-11-15-LLVMgold-path.patch;

     

       56
       56
        
               libllvmLibdir = "${libllvm.lib}/lib";

     

       57
       57
        
             })

     

       58
       58
        
           ];

+1 -1

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

···

       65
       65
        
             relative = "libcxx";

     

       66
       66
        
           })

     

       67
       67
        
         ] ++ lib.optionals stdenv.hostPlatform.isMusl [

     

       68
       68
       -
           ../../libcxx-0001-musl-hacks.patch

     

       68
       68
       +
           ../../common/libcxx/libcxx-0001-musl-hacks.patch

     

       69
       69
        
         ];

     

       70
       70
        
       

     

       71
       71
        
         postPatch = ''

+1 -1

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

···

       230
       230
        
           # timing-based tests are trouble

     

       231
       231
        
           rm utils/lit/tests/googletest-timeout.py

     

       232
       232
        
         '' + optionalString stdenv.hostPlatform.isMusl ''

     

       233
       233
       -
           patch -p1 -i ${../../TLI-musl.patch}

     

       233
       233
       +
           patch -p1 -i ${../../common/llvm/TLI-musl.patch}

     

       234
       234
        
           substituteInPlace unittests/Support/CMakeLists.txt \

     

       235
       235
        
             --replace "add_subdirectory(DynamicLibrary)" ""

     

       236
       236
        
           rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp

+1 -1

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

···

       52
       52
        
             ./gnu-install-dirs.patch

     

       53
       53
        
             ../../common/clang/add-nostdlibinc-flag.patch

     

       54
       54
        
             (substituteAll {

     

       55
       55
       -
               src = ../../clang-at-least-16-LLVMgold-path.patch;

     

       55
       55
       +
               src = ../../common/clang/clang-at-least-16-LLVMgold-path.patch;

     

       56
       56
        
              libllvmLibdir = "${libllvm.lib}/lib";

     

       57
       57
        
             })

     

       58
       58
        
           ];

+1 -1

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

···

       223
       223
        
           # timing-based tests are trouble

     

       224
       224
        
           rm utils/lit/tests/googletest-timeout.py

     

       225
       225
        
         '' + optionalString stdenv.hostPlatform.isMusl ''

     

       226
       226
       -
           patch -p1 -i ${../../TLI-musl.patch}

     

       226
       226
       +
           patch -p1 -i ${../../common/llvm/TLI-musl.patch}

     

       227
       227
        
           substituteInPlace unittests/Support/CMakeLists.txt \

     

       228
       228
        
             --replace "add_subdirectory(DynamicLibrary)" ""

     

       229
       229
        
           rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp

+1 -1

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

···

       53
       53
        
             ./gnu-install-dirs.patch

     

       54
       54
        
             ../../common/clang/add-nostdlibinc-flag.patch

     

       55
       55
        
             (substituteAll {

     

       56
       56
       -
               src = ../../clang-at-least-16-LLVMgold-path.patch;

     

       56
       56
       +
               src = ../../common/clang/clang-at-least-16-LLVMgold-path.patch;

     

       57
       57
        
              libllvmLibdir = "${libllvm.lib}/lib";

     

       58
       58
        
             })

     

       59
       59
        
           ];

+1 -1

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

···

       220
       220
        
           rm unittests/IR/PassBuilderCallbacksTest.cpp

     

       221
       221
        
           rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test

     

       222
       222
        
         '' + optionalString stdenv.hostPlatform.isMusl ''

     

       223
       223
       -
           patch -p1 -i ${../../TLI-musl.patch}

     

       223
       223
       +
           patch -p1 -i ${../../common/llvm/TLI-musl.patch}

     

       224
       224
        
           substituteInPlace unittests/Support/CMakeLists.txt \

     

       225
       225
        
             --replace "add_subdirectory(DynamicLibrary)" ""

     

       226
       226
        
           rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp

+1 -1

pkgs/development/compilers/llvm/9/clang/default.nix

···

       52
       52
        
             ./HIP-use-PATH-9.patch

     

       53
       53
        
             ./gnu-install-dirs.patch

     

       54
       54
        
             (substituteAll {

     

       55
       55
       -
               src = ../../clang-6-10-LLVMgold-path.patch;

     

       55
       55
       +
               src = ../../common/clang/clang-6-10-LLVMgold-path.patch;

     

       56
       56
        
               libllvmLibdir = "${libllvm.lib}/lib";

     

       57
       57
        
             })

     

       58
       58
        
           ];

+1 -1

pkgs/development/compilers/llvm/9/libcxx/default.nix

···

       22
       22
        
         patches = [

     

       23
       23
        
           ./gnu-install-dirs.patch

     

       24
       24
        
         ] ++ lib.optionals stdenv.hostPlatform.isMusl [

     

       25
       25
       -
           ../../libcxx-0001-musl-hacks.patch

     

       25
       25
       +
           ../../common/libcxx/libcxx-0001-musl-hacks.patch

     

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
        
         # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz"

+1 -1

pkgs/development/compilers/llvm/9/libcxxabi/default.nix

···

       17
       17
        
         '' + lib.optionalString stdenv.isDarwin ''

     

       18
       18
        
           export TRIPLE=x86_64-apple-darwin

     

       19
       19
        
         '' + lib.optionalString stdenv.hostPlatform.isMusl ''

     

       20
       20
       -
           patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch}

     

       20
       20
       +
           patch -p1 -d $(ls -d libcxx-*) -i ${../../common/libcxx/libcxx-0001-musl-hacks.patch}

     

       21
       21
        
         '' + lib.optionalString stdenv.hostPlatform.isWasm ''

     

       22
       22
        
           patch -p1 -d $(ls -d llvm-*) -i ${../../common/libcxxabi/wasm.patch}

     

       23
       23
        
         '';

+3 -3

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

···

       86
       86
        
           # of the flags used for the normal LLVM build. To avoid the need for building

     

       87
       87
        
           # a native libLLVM.so (which would fail) we force llvm-config to be linked

     

       88
       88
        
           # statically against the necessary LLVM components always.

     

       89
       89
       -
           ../../llvm-config-link-static.patch

     

       89
       89
       +
           ../../common/llvm/llvm-config-link-static.patch

     

       90
       90
        
       

     

       91
       91
        
           ./gnu-install-dirs.patch

     

       92
       92
        
           # Force a test to evaluate the saved benchmark for a CPU for which LLVM has

     

       93
       93
        
           # an execution model. See NixOS/nixpkgs#119673.

     

       94
       94
       -
           ../../exegesis-force-bdver2.patch

     

       94
       94
       +
           ./exegesis-force-bdver2.patch

     

       95
       95
        
       

     

       96
       96
        
           # Fix missing includes for GCC 11

     

       97
       97
        
           (fetchpatch {

     
···

       137
       137
        
             --replace "Path.cpp" ""

     

       138
       138
        
           rm unittests/Support/Path.cpp

     

       139
       139
        
         '' + optionalString stdenv.hostPlatform.isMusl ''

     

       140
       140
       -
           patch -p1 -i ${../../TLI-musl.patch}

     

       140
       140
       +
           patch -p1 -i ${../../common/llvm/TLI-musl.patch}

     

       141
       141
        
           substituteInPlace unittests/Support/CMakeLists.txt \

     

       142
       142
        
             --replace "add_subdirectory(DynamicLibrary)" ""

     

       143
       143
        
           rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp

pkgs/development/compilers/llvm/TLI-musl.patch pkgs/development/compilers/llvm/common/llvm/TLI-musl.patch

pkgs/development/compilers/llvm/clang-11-15-LLVMgold-path.patch pkgs/development/compilers/llvm/common/clang/clang-11-15-LLVMgold-path.patch

pkgs/development/compilers/llvm/clang-6-10-LLVMgold-path.patch pkgs/development/compilers/llvm/common/clang/clang-6-10-LLVMgold-path.patch

pkgs/development/compilers/llvm/clang-at-least-16-LLVMgold-path.patch pkgs/development/compilers/llvm/common/clang/clang-at-least-16-LLVMgold-path.patch

pkgs/development/compilers/llvm/exegesis-force-bdver2.patch pkgs/development/compilers/llvm/9/llvm/exegesis-force-bdver2.patch

+1 -1

pkgs/development/compilers/llvm/git/clang/default.nix

···

       54
       54
        
             ./gnu-install-dirs.patch

     

       55
       55
        
             ../../common/clang/add-nostdlibinc-flag.patch

     

       56
       56
        
             (substituteAll {

     

       57
       57
       -
               src = ../../clang-at-least-16-LLVMgold-path.patch;

     

       57
       57
       +
               src = ../../common/clang/clang-at-least-16-LLVMgold-path.patch;

     

       58
       58
        
              libllvmLibdir = "${libllvm.lib}/lib";

     

       59
       59
        
             })

     

       60
       60
        
           ];

+1 -1

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

···

       224
       224
        
           rm unittests/IR/PassBuilderCallbacksTest.cpp

     

       225
       225
        
           rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test

     

       226
       226
        
         '' + optionalString stdenv.hostPlatform.isMusl ''

     

       227
       227
       -
           patch -p1 -i ${../../TLI-musl.patch}

     

       227
       227
       +
           patch -p1 -i ${../../common/llvm/TLI-musl.patch}

     

       228
       228
        
           substituteInPlace unittests/Support/CMakeLists.txt \

     

       229
       229
        
             --replace "add_subdirectory(DynamicLibrary)" ""

     

       230
       230
        
           rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp

pkgs/development/compilers/llvm/libcxx-0001-musl-hacks.patch pkgs/development/compilers/llvm/common/libcxx/libcxx-0001-musl-hacks.patch

pkgs/development/compilers/llvm/llvm-config-link-static.patch pkgs/development/compilers/llvm/common/llvm/llvm-config-link-static.patch