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)`
107 lines
4.0 KiB
Diff
107 lines
4.0 KiB
Diff
diff --git a/tools/polly/CMakeLists.txt b/tools/polly/CMakeLists.txt
|
|
index 9939097f743e..8cc538da912a 100644
|
|
--- a/tools/polly/CMakeLists.txt
|
|
+++ b/tools/polly/CMakeLists.txt
|
|
@@ -2,7 +2,11 @@
|
|
if (NOT DEFINED LLVM_MAIN_SRC_DIR)
|
|
project(Polly)
|
|
cmake_minimum_required(VERSION 3.4.3)
|
|
+endif()
|
|
+
|
|
+include(GNUInstallDirs)
|
|
|
|
+if (NOT DEFINED LLVM_MAIN_SRC_DIR)
|
|
# Where is LLVM installed?
|
|
find_package(LLVM CONFIG REQUIRED)
|
|
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LLVM_CMAKE_DIR})
|
|
@@ -145,14 +149,14 @@ include_directories(
|
|
|
|
if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
|
|
install(DIRECTORY include/
|
|
- DESTINATION include
|
|
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
|
FILES_MATCHING
|
|
PATTERN "*.h"
|
|
PATTERN ".svn" EXCLUDE
|
|
)
|
|
|
|
install(DIRECTORY ${POLLY_BINARY_DIR}/include/
|
|
- DESTINATION include
|
|
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
|
FILES_MATCHING
|
|
PATTERN "*.h"
|
|
PATTERN "CMakeFiles" EXCLUDE
|
|
diff --git a/tools/polly/cmake/CMakeLists.txt b/tools/polly/cmake/CMakeLists.txt
|
|
index 211f95512717..f9e04a4844b6 100644
|
|
--- a/tools/polly/cmake/CMakeLists.txt
|
|
+++ b/tools/polly/cmake/CMakeLists.txt
|
|
@@ -79,18 +79,18 @@ file(GENERATE
|
|
|
|
# Generate PollyConfig.cmake for the install tree.
|
|
unset(POLLY_EXPORTS)
|
|
-set(POLLY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
|
|
+set(POLLY_INSTALL_PREFIX "")
|
|
set(POLLY_CONFIG_LLVM_CMAKE_DIR "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
|
|
-set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}")
|
|
-set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}")
|
|
+set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}")
|
|
+set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}")
|
|
if (POLLY_BUNDLED_ISL)
|
|
set(POLLY_CONFIG_INCLUDE_DIRS
|
|
- "${POLLY_INSTALL_PREFIX}/include"
|
|
- "${POLLY_INSTALL_PREFIX}/include/polly"
|
|
+ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}"
|
|
+ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}/polly"
|
|
)
|
|
else()
|
|
set(POLLY_CONFIG_INCLUDE_DIRS
|
|
- "${POLLY_INSTALL_PREFIX}/include"
|
|
+ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_INCLUDEDIR}"
|
|
${ISL_INCLUDE_DIRS}
|
|
)
|
|
endif()
|
|
@@ -100,12 +100,12 @@ endif()
|
|
foreach(tgt IN LISTS POLLY_CONFIG_EXPORTED_TARGETS)
|
|
get_target_property(tgt_type ${tgt} TYPE)
|
|
if (tgt_type STREQUAL "EXECUTABLE")
|
|
- set(tgt_prefix "bin/")
|
|
+ set(tgt_prefix "${CMAKE_INSTALL_BINDIR}/")
|
|
else()
|
|
- set(tgt_prefix "lib/")
|
|
+ set(tgt_prefix "${CMAKE_INSTALL_LIBDIR}/")
|
|
endif()
|
|
|
|
- set(tgt_path "${CMAKE_INSTALL_PREFIX}/${tgt_prefix}$<TARGET_FILE_NAME:${tgt}>")
|
|
+ set(tgt_path "${tgt_prefix}$<TARGET_FILE_NAME:${tgt}>")
|
|
file(RELATIVE_PATH tgt_path ${POLLY_CONFIG_CMAKE_DIR} ${tgt_path})
|
|
|
|
if (NOT tgt_type STREQUAL "INTERFACE_LIBRARY")
|
|
diff --git a/tools/polly/cmake/polly_macros.cmake b/tools/polly/cmake/polly_macros.cmake
|
|
index e48203871884..5bc8a2a52541 100644
|
|
--- a/tools/polly/cmake/polly_macros.cmake
|
|
+++ b/tools/polly/cmake/polly_macros.cmake
|
|
@@ -44,8 +44,8 @@ macro(add_polly_library name)
|
|
if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LLVMPolly")
|
|
install(TARGETS ${name}
|
|
EXPORT LLVMExports
|
|
- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
|
|
- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
|
|
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}
|
|
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
|
|
endif()
|
|
set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name})
|
|
endmacro(add_polly_library)
|
|
diff --git a/tools/polly/lib/External/CMakeLists.txt b/tools/polly/lib/External/CMakeLists.txt
|
|
index 8ffd984e542b..261cc19f3238 100644
|
|
--- a/tools/polly/lib/External/CMakeLists.txt
|
|
+++ b/tools/polly/lib/External/CMakeLists.txt
|
|
@@ -274,7 +274,7 @@ if (POLLY_BUNDLED_ISL)
|
|
install(DIRECTORY
|
|
${ISL_SOURCE_DIR}/include/
|
|
${ISL_BINARY_DIR}/include/
|
|
- DESTINATION include/polly
|
|
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/polly
|
|
FILES_MATCHING
|
|
PATTERN "*.h"
|
|
PATTERN "CMakeFiles" EXCLUDE
|