diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix index e2e78e16d79797d..e75290da711bd06 100644 --- a/pkgs/development/compilers/llvm/10/default.nix +++ b/pkgs/development/compilers/llvm/10/default.nix @@ -26,7 +26,9 @@ let ''; mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" - ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" + mkdir -p "$rsrc/share" + ln -s "${targetLlvmLibraries.compiler-rt.out}/share/"* "$rsrc/share/" + ln -s "${targetLlvmLibraries.compiler-rt.dev}/include/"*.txt "$rsrc/share/" ''; in { diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index 69c6564babe7500..bf409ca0dc76d13 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -28,7 +28,9 @@ let ''; mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" - ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" + mkdir -p "$rsrc/share" + ln -s "${targetLlvmLibraries.compiler-rt.out}/share/"* "$rsrc/share/" + ln -s "${targetLlvmLibraries.compiler-rt.dev}/include/"*.txt "$rsrc/share/" ''; in { diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index ea054107e056232..db502276395277d 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -35,7 +35,9 @@ let ''; mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" - ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" + mkdir -p "$rsrc/share" + ln -s "${targetLlvmLibraries.compiler-rt.out}/share/"* "$rsrc/share/" + ln -s "${targetLlvmLibraries.compiler-rt.dev}/include/"*.txt "$rsrc/share/" ''; in { diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix index 7aa3f9099cc9901..8f33e07fa483fbe 100644 --- a/pkgs/development/compilers/llvm/7/default.nix +++ b/pkgs/development/compilers/llvm/7/default.nix @@ -26,6 +26,9 @@ let ''; mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" + mkdir -p "$rsrc/share" + ln -s "${targetLlvmLibraries.compiler-rt.out}/share/"* "$rsrc/share/" + ln -s "${targetLlvmLibraries.compiler-rt.dev}/include/"*.txt "$rsrc/share/" ''; in { diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix index bcbbd155e36c1f6..3eb2e219bef13a5 100644 --- a/pkgs/development/compilers/llvm/8/default.nix +++ b/pkgs/development/compilers/llvm/8/default.nix @@ -26,6 +26,9 @@ let ''; mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" + mkdir -p "$rsrc/share" + ln -s "${targetLlvmLibraries.compiler-rt.out}/share/"* "$rsrc/share/" + ln -s "${targetLlvmLibraries.compiler-rt.dev}/include/"*.txt "$rsrc/share/" ''; in { diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix index 0660bac137f6934..e6130f4952c9c6d 100644 --- a/pkgs/development/compilers/llvm/9/default.nix +++ b/pkgs/development/compilers/llvm/9/default.nix @@ -26,6 +26,9 @@ let ''; mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" + mkdir -p "$rsrc/share" + ln -s "${targetLlvmLibraries.compiler-rt.out}/share/"* "$rsrc/share/" + ln -s "${targetLlvmLibraries.compiler-rt.dev}/include/"*.txt "$rsrc/share/" ''; in {