pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #123103 from sternenseemann/compiler-rt-resources

llvmPackages_{7-12}.compiler-rt: install resource files to DATADIR

authored by John Ericson and committed by GitHub 4236fb1c c1060023

+6 -3
unified split
+1 -1
pkgs/development/compilers/llvm/7/compiler-rt/gnu-install-dirs.patch
··· 19 19 # Install in Clang resource directory. 20 20 install(FILES ${file_name} 21 21 - DESTINATION ${COMPILER_RT_INSTALL_PATH}/share 22 - + DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR} 22 + + DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR} 23 23 COMPONENT ${component}) 24 24 add_dependencies(${component} ${target_name}) 25 25
+1
pkgs/development/compilers/llvm/7/default.nix
··· 44 44 ''; 45 45 mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' 46 46 ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" 47 + ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" 47 48 ''; 48 49 49 50 bintoolsNoLibc' =
+1 -1
pkgs/development/compilers/llvm/8/compiler-rt/gnu-install-dirs.patch
··· 19 19 # Install in Clang resource directory. 20 20 install(FILES ${file_name} 21 21 - DESTINATION ${COMPILER_RT_INSTALL_PATH}/share 22 - + DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR} 22 + + DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR} 23 23 COMPONENT ${component}) 24 24 add_dependencies(${component} ${target_name}) 25 25
+1
pkgs/development/compilers/llvm/8/default.nix
··· 44 44 ''; 45 45 mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' 46 46 ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" 47 + ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" 47 48 ''; 48 49 49 50 bintoolsNoLibc' =
+1 -1
pkgs/development/compilers/llvm/9/compiler-rt/gnu-install-dirs.patch
··· 19 19 # Install in Clang resource directory. 20 20 install(FILES ${file_name} 21 21 - DESTINATION ${COMPILER_RT_INSTALL_PATH}/share 22 - + DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR} 22 + + DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR} 23 23 COMPONENT ${component}) 24 24 add_dependencies(${component} ${target_name}) 25 25
+1
pkgs/development/compilers/llvm/9/default.nix
··· 44 44 ''; 45 45 mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' 46 46 ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" 47 + ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" 47 48 ''; 48 49 49 50 bintoolsNoLibc' =