7869d16545
Also begin to start work on cross compilation, though that will have to
be finished later.
The patches are based on the first version of
https://reviews.llvm.org/D99484. It's very annoying to do the
back-porting but the review has uncovered nothing super major so I'm
fine sticking with what I've got.
Beyond making the outputs work, I also strove to re-sync the packages,
as they have been drifting pointlessly apart for some time.
----
Other misc notes, highly incomplete
- lvm-config-native and llvm-config are put in `dev` because they are
tools just for build time.
- Clang no longer has an lld dep. That was introduced in
db29857eb3, but if clang needs help
finding lld when it is used we should just pass it flags / put in the
resource dir. Providing it at build time increases critical path
length for no good reason.
----
A note on `nativeCC`:
`stdenv` takes tools from the previous stage, so:
1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.stdenv.cc`: `(?0, ?1, x)`
while:
1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.targetPackages`: `(x, x, ?2)`
3. `pkgsBuildBuild.targetPackages.stdenv.cc`: `(?1, x, x)`
103 lines
5.1 KiB
Diff
103 lines
5.1 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index f997c53410c1..ac079d89b57b 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -12,6 +12,7 @@ cmake_minimum_required(VERSION 3.4.3)
|
|
# Check if compiler-rt is built as a standalone project.
|
|
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD)
|
|
project(CompilerRT C CXX ASM)
|
|
+ include(GNUInstallDirs)
|
|
set(COMPILER_RT_STANDALONE_BUILD TRUE)
|
|
endif()
|
|
|
|
diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake
|
|
index bc5fb9ff722b..91fb79d1980c 100644
|
|
--- a/cmake/Modules/AddCompilerRT.cmake
|
|
+++ b/cmake/Modules/AddCompilerRT.cmake
|
|
@@ -344,7 +344,7 @@ macro(add_compiler_rt_resource_file target_name file_name component)
|
|
add_custom_target(${target_name} DEPENDS ${dst_file})
|
|
# Install in Clang resource directory.
|
|
install(FILES ${file_name}
|
|
- DESTINATION ${COMPILER_RT_INSTALL_PATH}
|
|
+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_PREFIX}
|
|
COMPONENT ${component})
|
|
add_dependencies(${component} ${target_name})
|
|
|
|
@@ -361,7 +361,7 @@ macro(add_compiler_rt_script name)
|
|
add_custom_target(${name} DEPENDS ${dst})
|
|
install(FILES ${dst}
|
|
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
|
|
- DESTINATION ${COMPILER_RT_INSTALL_PATH}/bin)
|
|
+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_BINDIR})
|
|
endmacro(add_compiler_rt_script src name)
|
|
|
|
# Builds custom version of libc++ and installs it in <prefix>.
|
|
diff --git a/cmake/Modules/CompilerRTDarwinUtils.cmake b/cmake/Modules/CompilerRTDarwinUtils.cmake
|
|
index f646975475bb..75885bf305b8 100644
|
|
--- a/cmake/Modules/CompilerRTDarwinUtils.cmake
|
|
+++ b/cmake/Modules/CompilerRTDarwinUtils.cmake
|
|
@@ -391,7 +391,7 @@ macro(darwin_add_embedded_builtin_libraries)
|
|
set(DARWIN_macho_embedded_LIBRARY_OUTPUT_DIR
|
|
${COMPILER_RT_OUTPUT_DIR}/lib/macho_embedded)
|
|
set(DARWIN_macho_embedded_LIBRARY_INSTALL_DIR
|
|
- ${COMPILER_RT_INSTALL_PATH}/lib/macho_embedded)
|
|
+ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/macho_embedded)
|
|
|
|
set(CFLAGS_armv7 "-target thumbv7-apple-darwin-eabi")
|
|
set(CFLAGS_i386 "-march=pentium")
|
|
diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake
|
|
index b38c6ca96fac..a4580414cbc8 100644
|
|
--- a/cmake/base-config-ix.cmake
|
|
+++ b/cmake/base-config-ix.cmake
|
|
@@ -43,11 +43,11 @@ if (LLVM_TREE_AVAILABLE)
|
|
else()
|
|
# Take output dir and install path from the user.
|
|
set(COMPILER_RT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH
|
|
- "Path where built compiler-rt libraries should be stored.")
|
|
+ "Path where built compiler-rt build artifacts should be stored.")
|
|
set(COMPILER_RT_EXEC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin CACHE PATH
|
|
"Path where built compiler-rt executables should be stored.")
|
|
- set(COMPILER_RT_INSTALL_PATH ${CMAKE_INSTALL_PREFIX} CACHE PATH
|
|
- "Path where built compiler-rt libraries should be installed.")
|
|
+ set(COMPILER_RT_INSTALL_PATH "" CACHE PATH
|
|
+ "Prefix where built compiler-rt artifacts should be installed, comes before CMAKE_INSTALL_PREFIX.")
|
|
option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." OFF)
|
|
option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" OFF)
|
|
# Use a host compiler to compile/link tests.
|
|
@@ -67,9 +67,9 @@ if(NOT DEFINED COMPILER_RT_OS_DIR)
|
|
string(TOLOWER ${CMAKE_SYSTEM_NAME} COMPILER_RT_OS_DIR)
|
|
endif()
|
|
set(COMPILER_RT_LIBRARY_OUTPUT_DIR
|
|
- ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR})
|
|
+ ${COMPILER_RT_OUTPUT_DIR}/${CMAKE_INSTALL_FULL_LIBDIR}/${COMPILER_RT_OS_DIR})
|
|
set(COMPILER_RT_LIBRARY_INSTALL_DIR
|
|
- ${COMPILER_RT_INSTALL_PATH}/lib/${COMPILER_RT_OS_DIR})
|
|
+ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/${COMPILER_RT_OS_DIR})
|
|
|
|
if(APPLE)
|
|
# On Darwin if /usr/include doesn't exist, the user probably has Xcode but not
|
|
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
|
|
index ec3bf40b95e6..af119f10ee2b 100644
|
|
--- a/include/CMakeLists.txt
|
|
+++ b/include/CMakeLists.txt
|
|
@@ -44,8 +44,8 @@ set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT Misc")
|
|
# Install sanitizer headers.
|
|
install(FILES ${SANITIZER_HEADERS}
|
|
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
|
|
- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/sanitizer)
|
|
+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/sanitizer)
|
|
# Install xray headers.
|
|
install(FILES ${XRAY_HEADERS}
|
|
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
|
|
- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/xray)
|
|
+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/xray)
|
|
diff --git a/lib/dfsan/CMakeLists.txt b/lib/dfsan/CMakeLists.txt
|
|
index 2c486bff821b..0ee715da95f8 100644
|
|
--- a/lib/dfsan/CMakeLists.txt
|
|
+++ b/lib/dfsan/CMakeLists.txt
|
|
@@ -44,4 +44,4 @@ add_custom_command(OUTPUT ${dfsan_abilist_filename}
|
|
DEPENDS done_abilist.txt libc_ubuntu1404_abilist.txt)
|
|
add_dependencies(dfsan dfsan_abilist)
|
|
install(FILES ${dfsan_abilist_filename}
|
|
- DESTINATION ${COMPILER_RT_INSTALL_PATH})
|
|
+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_PREFIX})
|