public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

llvmPackages_{10,11,12}.compiler-rt: install resource txts to $out/share

Browse Source 
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.
This commit is contained in:
sternenseemann 2021-05-15 17:40:24 +02:00
parent ec10b0958d
commit 91cba7b0a9
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/llvm/10/compiler-rt/gnu-install-dirs.patch
View File

@ -19,7 +19,7 @@ index 35a48c6af29c..e4300f256091 100644
# Install in Clang resource directory. # Install in Clang resource directory.
install(FILES ${file_name} install(FILES ${file_name}
- DESTINATION ${COMPILER_RT_INSTALL_PATH}/share - 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}) COMPONENT ${component})
add_dependencies(${component} ${target_name}) add_dependencies(${component} ${target_name})

2
pkgs/development/compilers/llvm/11/compiler-rt/gnu-install-dirs.patch
View File

@ -19,7 +19,7 @@ index 7c127a93dfa7..6a95a65b70a7 100644
# Install in Clang resource directory. # Install in Clang resource directory.
install(FILES ${file_name} install(FILES ${file_name}
- DESTINATION ${COMPILER_RT_INSTALL_PATH}/share - 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}) COMPONENT ${component})
add_dependencies(${component} ${target_name}) add_dependencies(${component} ${target_name})

2
pkgs/development/compilers/llvm/12/compiler-rt/gnu-install-dirs.patch
View File

@ -19,7 +19,7 @@ index 361538a58e47..f0d8d9ab80f1 100644
# Install in Clang resource directory. # Install in Clang resource directory.
install(FILES ${file_name} install(FILES ${file_name}
- DESTINATION ${COMPILER_RT_INSTALL_PATH}/share - 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}) COMPONENT ${component})
add_dependencies(${component} ${target_name}) add_dependencies(${component} ${target_name})