176 lines
7.8 KiB
Diff
176 lines
7.8 KiB
Diff
|
diff --git a/llvm-project/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/llvm-project/compiler-rt/cmake/Modules/AddCompilerRT.cmake
|
||
|
|
index 00bb892be..af4677fdc 100644
|
||
|
|
--- a/llvm-project/compiler-rt/cmake/Modules/AddCompilerRT.cmake
|
||
|
|
+++ b/llvm-project/compiler-rt/cmake/Modules/AddCompilerRT.cmake
|
||
|
|
@@ -355,9 +355,9 @@ function(add_compiler_rt_runtime name type)
|
||
|
|
DEPENDS ${sources_${libname}}
|
||
|
|
COMMENT "Building C object ${output_file_${libname}}")
|
||
|
|
add_custom_target(${libname} DEPENDS ${output_dir_${libname}}/${output_file_${libname}})
|
||
|
|
- install(FILES ${output_dir_${libname}}/${output_file_${libname}}
|
||
|
|
- DESTINATION ${install_dir_${libname}}
|
||
|
|
- ${COMPONENT_OPTION})
|
||
|
|
+ #install(FILES ${output_dir_${libname}}/${output_file_${libname}}
|
||
|
|
+ # DESTINATION ${install_dir_${libname}}
|
||
|
|
+ # ${COMPONENT_OPTION})
|
||
|
|
else()
|
||
|
|
add_library(${libname} ${type} ${sources_${libname}})
|
||
|
|
set_target_compile_flags(${libname} ${extra_cflags_${libname}})
|
||
|
|
@@ -365,13 +365,13 @@ function(add_compiler_rt_runtime name type)
|
||
|
|
set_property(TARGET ${libname} APPEND PROPERTY
|
||
|
|
COMPILE_DEFINITIONS ${LIB_DEFS})
|
||
|
|
set_target_output_directories(${libname} ${output_dir_${libname}})
|
||
|
|
- install(TARGETS ${libname}
|
||
|
|
- ARCHIVE DESTINATION ${install_dir_${libname}}
|
||
|
|
- ${COMPONENT_OPTION}
|
||
|
|
- LIBRARY DESTINATION ${install_dir_${libname}}
|
||
|
|
- ${COMPONENT_OPTION}
|
||
|
|
- RUNTIME DESTINATION ${install_dir_${libname}}
|
||
|
|
- ${COMPONENT_OPTION})
|
||
|
|
+ # install(TARGETS ${libname}
|
||
|
|
+ # ARCHIVE DESTINATION ${install_dir_${libname}}
|
||
|
|
+ # ${COMPONENT_OPTION}
|
||
|
|
+ # LIBRARY DESTINATION ${install_dir_${libname}}
|
||
|
|
+ # ${COMPONENT_OPTION}
|
||
|
|
+ # RUNTIME DESTINATION ${install_dir_${libname}}
|
||
|
|
+ # ${COMPONENT_OPTION})
|
||
|
|
endif()
|
||
|
|
if(LIB_DEPS)
|
||
|
|
add_dependencies(${libname} ${LIB_DEPS})
|
||
|
|
@@ -557,10 +557,10 @@ macro(add_compiler_rt_resource_file target_name file_name component)
|
||
|
|
COMMENT "Copying ${file_name}...")
|
||
|
|
add_custom_target(${target_name} DEPENDS ${dst_file})
|
||
|
|
# Install in Clang resource directory.
|
||
|
|
- install(FILES ${file_name}
|
||
|
|
- DESTINATION ${COMPILER_RT_INSTALL_DATA_DIR}
|
||
|
|
- COMPONENT ${component})
|
||
|
|
- add_dependencies(${component} ${target_name})
|
||
|
|
+ #install(FILES ${file_name}
|
||
|
|
+ # DESTINATION ${COMPILER_RT_INSTALL_DATA_DIR}
|
||
|
|
+ # COMPONENT ${component})
|
||
|
|
+ #add_dependencies(${component} ${target_name})
|
||
|
|
|
||
|
|
set_target_properties(${target_name} PROPERTIES FOLDER "Compiler-RT Misc")
|
||
|
|
endmacro()
|
||
|
|
diff --git a/llvm-project/libc/loader/linux/CMakeLists.txt b/llvm-project/libc/loader/linux/CMakeLists.txt
|
||
|
|
index 92ff8965b..e2aa73465 100644
|
||
|
|
--- a/llvm-project/libc/loader/linux/CMakeLists.txt
|
||
|
|
+++ b/llvm-project/libc/loader/linux/CMakeLists.txt
|
||
|
|
@@ -90,7 +90,7 @@ foreach(target IN LISTS startup_components)
|
||
|
|
set(fq_target_name libc.loader.linux.${target})
|
||
|
|
add_dependencies(libc-startup ${fq_target_name})
|
||
|
|
get_target_property(loader_object ${fq_target_name} LOADER_OBJECT)
|
||
|
|
- install(FILES ${loader_object}
|
||
|
|
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||
|
|
- COMPONENT ${LIBC_COMPONENT})
|
||
|
|
+ #install(FILES ${loader_object}
|
||
|
|
+ # DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||
|
|
+ # COMPONENT ${LIBC_COMPONENT})
|
||
|
|
endforeach()
|
||
|
|
diff --git a/llvm-project/libcxx/src/CMakeLists.txt b/llvm-project/libcxx/src/CMakeLists.txt
|
||
|
|
index 9abf548ab..2170d4391 100644
|
||
|
|
--- a/llvm-project/libcxx/src/CMakeLists.txt
|
||
|
|
+++ b/llvm-project/libcxx/src/CMakeLists.txt
|
||
|
|
@@ -366,32 +366,32 @@ if (LIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY)
|
||
|
|
endif()
|
||
|
|
|
||
|
|
if (LIBCXX_INSTALL_SHARED_LIBRARY)
|
||
|
|
- install(TARGETS cxx_shared
|
||
|
|
- ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
|
||
|
|
- LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
|
||
|
|
- RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx)
|
||
|
|
+ #install(TARGETS cxx_shared
|
||
|
|
+ # ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
|
||
|
|
+ # LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
|
||
|
|
+ # RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx)
|
||
|
|
endif()
|
||
|
|
|
||
|
|
if (LIBCXX_INSTALL_STATIC_LIBRARY)
|
||
|
|
- install(TARGETS cxx_static
|
||
|
|
- ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
|
||
|
|
- LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
|
||
|
|
- RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx)
|
||
|
|
+ # install(TARGETS cxx_static
|
||
|
|
+ # ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
|
||
|
|
+ # LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
|
||
|
|
+ # RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx)
|
||
|
|
endif()
|
||
|
|
|
||
|
|
if (LIBCXX_INSTALL_LIBRARY)
|
||
|
|
- install(TARGETS cxx_experimental
|
||
|
|
- LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
|
||
|
|
- ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
|
||
|
|
- RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx)
|
||
|
|
+ # install(TARGETS cxx_experimental
|
||
|
|
+ # LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
|
||
|
|
+ # ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
|
||
|
|
+ # RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx)
|
||
|
|
endif()
|
||
|
|
|
||
|
|
# NOTE: This install command must go after the cxx install command otherwise
|
||
|
|
# it will not be executed after the library symlinks are installed.
|
||
|
|
if (LIBCXX_ENABLE_SHARED AND LIBCXX_ENABLE_ABI_LINKER_SCRIPT)
|
||
|
|
- install(FILES "$<TARGET_LINKER_FILE:cxx_shared>"
|
||
|
|
- DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR}
|
||
|
|
- COMPONENT libcxx)
|
||
|
|
+ # install(FILES "$<TARGET_LINKER_FILE:cxx_shared>"
|
||
|
|
+ # DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR}
|
||
|
|
+ # COMPONENT libcxx)
|
||
|
|
endif()
|
||
|
|
|
||
|
|
if (NOT CMAKE_CONFIGURATION_TYPES)
|
||
|
|
diff --git a/llvm-project/llvm/tools/lto/CMakeLists.txt b/llvm-project/llvm/tools/lto/CMakeLists.txt
|
||
|
|
index 67f6d3af4..51aa827a4 100644
|
||
|
|
--- a/llvm-project/llvm/tools/lto/CMakeLists.txt
|
||
|
|
+++ b/llvm-project/llvm/tools/lto/CMakeLists.txt
|
||
|
|
@@ -32,9 +32,9 @@ endif()
|
||
|
|
add_llvm_library(${LTO_LIBRARY_NAME} ${LTO_LIBRARY_TYPE} INSTALL_WITH_TOOLCHAIN
|
||
|
|
${SOURCES} DEPENDS intrinsics_gen)
|
||
|
|
|
||
|
|
-install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h
|
||
|
|
- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm-c"
|
||
|
|
- COMPONENT LTO)
|
||
|
|
+#install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h
|
||
|
|
+# DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm-c"
|
||
|
|
+# COMPONENT LTO)
|
||
|
|
|
||
|
|
if (APPLE)
|
||
|
|
set(LTO_VERSION ${LLVM_VERSION_MAJOR})
|
||
|
|
diff --git a/llvm-project/llvm/tools/opt-viewer/CMakeLists.txt b/llvm-project/llvm/tools/opt-viewer/CMakeLists.txt
|
||
|
|
index c0070f8cb..afe9756e0 100644
|
||
|
|
--- a/llvm-project/llvm/tools/opt-viewer/CMakeLists.txt
|
||
|
|
+++ b/llvm-project/llvm/tools/opt-viewer/CMakeLists.txt
|
||
|
|
@@ -6,11 +6,11 @@ set (files
|
||
|
|
"optrecord.py"
|
||
|
|
"style.css")
|
||
|
|
|
||
|
|
-foreach (file ${files})
|
||
|
|
- install(PROGRAMS ${file}
|
||
|
|
- DESTINATION "${CMAKE_INSTALL_DATADIR}/opt-viewer"
|
||
|
|
- COMPONENT opt-viewer)
|
||
|
|
-endforeach (file)
|
||
|
|
+#foreach (file ${files})
|
||
|
|
+ # install(PROGRAMS ${file}
|
||
|
|
+ # DESTINATION "${CMAKE_INSTALL_DATADIR}/opt-viewer"
|
||
|
|
+ # COMPONENT opt-viewer)
|
||
|
|
+ #endforeach (file)
|
||
|
|
|
||
|
|
add_custom_target(opt-viewer DEPENDS ${files})
|
||
|
|
if(NOT LLVM_ENABLE_IDE)
|
||
|
|
diff --git a/llvm-project/llvm/tools/remarks-shlib/CMakeLists.txt b/llvm-project/llvm/tools/remarks-shlib/CMakeLists.txt
|
||
|
|
index f22cedd9e..13ec0103d 100644
|
||
|
|
--- a/llvm-project/llvm/tools/remarks-shlib/CMakeLists.txt
|
||
|
|
+++ b/llvm-project/llvm/tools/remarks-shlib/CMakeLists.txt
|
||
|
|
@@ -18,9 +18,9 @@ if(LLVM_ENABLE_PIC)
|
||
|
|
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -INCLUDE:malloc")
|
||
|
|
endif()
|
||
|
|
|
||
|
|
- install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/Remarks.h
|
||
|
|
- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm-c"
|
||
|
|
- COMPONENT Remarks)
|
||
|
|
+ # install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/Remarks.h
|
||
|
|
+ # DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm-c"
|
||
|
|
+ # COMPONENT Remarks)
|
||
|
|
|
||
|
|
if (APPLE)
|
||
|
|
set(REMARKS_VERSION ${LLVM_VERSION_MAJOR})
|