From 917429233b810d33a19a678c55e5d6625c6c4a15 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 16 Jan 2018 20:56:39 +0100 Subject: clang: patch cmake files for lib output Fixes cmake build issues introduced in #33342. --- pkgs/development/compilers/llvm/3.8/clang/default.nix | 2 ++ pkgs/development/compilers/llvm/3.9/clang/default.nix | 2 ++ pkgs/development/compilers/llvm/4/clang/default.nix | 2 ++ pkgs/development/compilers/llvm/5/clang/default.nix | 2 ++ 4 files changed, 8 insertions(+) (limited to 'pkgs/development/compilers') diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index 388c24e63364..fb7a5afb3dd2 100644 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -40,6 +40,8 @@ let # Move libclang to 'lib' output moveToOutput "lib/libclang.*" "$lib" + substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." mkdir -p $python/bin $python/share/clang/ mv $out/bin/{git-clang-format,scan-view} $python/bin diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index f215aadc4d98..aafe30e4c9b3 100644 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -42,6 +42,8 @@ let # Move libclang to 'lib' output moveToOutput "lib/libclang.*" "$lib" + substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." mkdir -p $python/bin $python/share/clang/ mv $out/bin/{git-clang-format,scan-view} $python/bin diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index 404b65c56ab7..223c4bd032ff 100644 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ b/pkgs/development/compilers/llvm/4/clang/default.nix @@ -61,6 +61,8 @@ let # Move libclang to 'lib' output moveToOutput "lib/libclang.*" "$lib" + substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." mkdir -p $python/bin $python/share/clang/ mv $out/bin/{git-clang-format,scan-view} $python/bin diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index aaddd020a729..a387f49bd6b3 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -62,6 +62,8 @@ let # Move libclang to 'lib' output moveToOutput "lib/libclang.*" "$lib" + substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." mkdir -p $python/bin $python/share/clang/ mv $out/bin/{git-clang-format,scan-view} $python/bin -- cgit 1.4.1 From 5fafb7ef739ccf36ba7914eb522471e91af4c431 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 20 Jan 2018 09:48:35 +0100 Subject: clang-3.8: fixup build after #33953 917429233b --- pkgs/development/compilers/llvm/3.8/clang/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/compilers') diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index fb7a5afb3dd2..0147485dd58d 100644 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -40,7 +40,7 @@ let # Move libclang to 'lib' output moveToOutput "lib/libclang.*" "$lib" - substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ + substituteInPlace $out/share/clang/cmake/ClangTargets-release.cmake \ --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." mkdir -p $python/bin $python/share/clang/ -- cgit 1.4.1