diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-02-23 05:14:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-23 05:14:36 +0100 |
| commit | bd1607202d4befa0c17ba323d1ed985291bb157e (patch) | |
| tree | 029fc88ef506377c32039966846ea0ae9cc70745 /pkgs/development/compilers/llvm/git | |
| parent | cbc4211f0afffe6dfd2478a62615dd5175a13f9a (diff) | |
| download | nixlib-bd1607202d4befa0c17ba323d1ed985291bb157e.tar nixlib-bd1607202d4befa0c17ba323d1ed985291bb157e.tar.gz nixlib-bd1607202d4befa0c17ba323d1ed985291bb157e.tar.bz2 nixlib-bd1607202d4befa0c17ba323d1ed985291bb157e.tar.lz nixlib-bd1607202d4befa0c17ba323d1ed985291bb157e.tar.xz nixlib-bd1607202d4befa0c17ba323d1ed985291bb157e.tar.zst nixlib-bd1607202d4befa0c17ba323d1ed985291bb157e.zip | |
llvmPackages: move patches to proper folders (#287092)
* llvmPackages: move clang-*-LLVMgold-path.patch to common/clang * llvmPackages: move exegesis-force-bdver2.patch to 9/llvm * llvmPackages: move llvm-config-link-static.patch to common/llvm * llvmPackages: move TLI-musl.patch to common/llvm * llvmPackages: move libcxx-0001-musl-hacks.patch to common/llvm
Diffstat (limited to 'pkgs/development/compilers/llvm/git')
| -rw-r--r-- | pkgs/development/compilers/llvm/git/clang/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/git/llvm/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/llvm/git/clang/default.nix b/pkgs/development/compilers/llvm/git/clang/default.nix index eea346ef22ef..01b33c540ca2 100644 --- a/pkgs/development/compilers/llvm/git/clang/default.nix +++ b/pkgs/development/compilers/llvm/git/clang/default.nix @@ -54,7 +54,7 @@ let ./gnu-install-dirs.patch ../../common/clang/add-nostdlibinc-flag.patch (substituteAll { - src = ../../clang-at-least-16-LLVMgold-path.patch; + src = ../../common/clang/clang-at-least-16-LLVMgold-path.patch; libllvmLibdir = "${libllvm.lib}/lib"; }) ]; diff --git a/pkgs/development/compilers/llvm/git/llvm/default.nix b/pkgs/development/compilers/llvm/git/llvm/default.nix index 3c52b7a9bb0b..b8cef2287806 100644 --- a/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/pkgs/development/compilers/llvm/git/llvm/default.nix @@ -224,7 +224,7 @@ stdenv.mkDerivation (rec { rm unittests/IR/PassBuilderCallbacksTest.cpp rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test '' + optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -i ${../../TLI-musl.patch} + patch -p1 -i ${../../common/llvm/TLI-musl.patch} substituteInPlace unittests/Support/CMakeLists.txt \ --replace "add_subdirectory(DynamicLibrary)" "" rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp |