diff options
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/llvm/15')
3 files changed, 3 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/compilers/llvm/15/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/15/clang/default.nix index 9ec15a393004..de789edaa9ff 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/15/clang/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/15/clang/default.nix @@ -52,7 +52,7 @@ let ./gnu-install-dirs.patch ../../common/clang/add-nostdlibinc-flag.patch (substituteAll { - src = ../../clang-11-15-LLVMgold-path.patch; + src = ../../common/clang/clang-11-15-LLVMgold-path.patch; libllvmLibdir = "${libllvm.lib}/lib"; }) ]; diff --git a/nixpkgs/pkgs/development/compilers/llvm/15/libcxx/default.nix b/nixpkgs/pkgs/development/compilers/llvm/15/libcxx/default.nix index be56770039d8..6a055581fffd 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/15/libcxx/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/15/libcxx/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { relative = "libcxx"; }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - ../../libcxx-0001-musl-hacks.patch + ../../common/libcxx/libcxx-0001-musl-hacks.patch ]; postPatch = '' diff --git a/nixpkgs/pkgs/development/compilers/llvm/15/llvm/default.nix b/nixpkgs/pkgs/development/compilers/llvm/15/llvm/default.nix index 4f17678ba14f..7f1232d57a18 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/15/llvm/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/15/llvm/default.nix @@ -230,7 +230,7 @@ in stdenv.mkDerivation (rec { # timing-based tests are trouble rm utils/lit/tests/googletest-timeout.py '' + 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 |