From 91cba7b0a9841b9e63aaff51cf00ea3d3e2229dd Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 15 May 2021 17:40:24 +0200 Subject: [PATCH] llvmPackages_{10,11,12}.compiler-rt: install resource txts to $out/share 7869d1654517c028aa76fc1dedc9b5ac301a867a changed how resource files are installed. Likely by accident, now some of the resource files are installed to $dev/include instead of $out/share. This causes the cc wrapper's resource-root to miss those files from compiler-rt as they are in a different place than expected. This commit fixes all instances of this incorrect installation for llvmPackages_10, 11 and 12 which are the only llvm package sets which link ${targetLlvmLibraries.compiler-rt.out}/share to the resource-root. For the other llvm package set this will likely also need to be fixed, but it doesn't have to have immediate urgency and doing it in two steps allows us to (hopefully) fix the chromium build without causing a darwin stdenv rebuild. The full fix can be found in #123103 and should probably be included in the next staging-next rotation. --- .../compilers/llvm/10/compiler-rt/gnu-install-dirs.patch | 2 +- .../compilers/llvm/11/compiler-rt/gnu-install-dirs.patch | 2 +- .../compilers/llvm/12/compiler-rt/gnu-install-dirs.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/10/compiler-rt/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/10/compiler-rt/gnu-install-dirs.patch index 7bc835914a3..db0bd006eaf 100644 --- a/pkgs/development/compilers/llvm/10/compiler-rt/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/10/compiler-rt/gnu-install-dirs.patch @@ -19,7 +19,7 @@ index 35a48c6af29c..e4300f256091 100644 # Install in Clang resource directory. install(FILES ${file_name} - DESTINATION ${COMPILER_RT_INSTALL_PATH}/share -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR} ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR} COMPONENT ${component}) add_dependencies(${component} ${target_name}) diff --git a/pkgs/development/compilers/llvm/11/compiler-rt/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/11/compiler-rt/gnu-install-dirs.patch index 1d1ebb570ce..91e20882929 100644 --- a/pkgs/development/compilers/llvm/11/compiler-rt/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/11/compiler-rt/gnu-install-dirs.patch @@ -19,7 +19,7 @@ index 7c127a93dfa7..6a95a65b70a7 100644 # Install in Clang resource directory. install(FILES ${file_name} - DESTINATION ${COMPILER_RT_INSTALL_PATH}/share -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR} ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR} COMPONENT ${component}) add_dependencies(${component} ${target_name}) diff --git a/pkgs/development/compilers/llvm/12/compiler-rt/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/12/compiler-rt/gnu-install-dirs.patch index c18d7924890..5f025764de1 100644 --- a/pkgs/development/compilers/llvm/12/compiler-rt/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/12/compiler-rt/gnu-install-dirs.patch @@ -19,7 +19,7 @@ index 361538a58e47..f0d8d9ab80f1 100644 # Install in Clang resource directory. install(FILES ${file_name} - DESTINATION ${COMPILER_RT_INSTALL_PATH}/share -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR} ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR} COMPONENT ${component}) add_dependencies(${component} ${target_name})