diff options
| author | Petr Hosek <phosek@chromium.org> | 2018-01-11 07:05:41 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2018-01-11 07:05:41 +0000 |
| commit | 37d0708903e4474aed7de5c2c600297f9e89402e (patch) | |
| tree | 87b480aff8adf17c3d2c3ee44a8883016ab83197 | |
| parent | 28af137d953e1092a40537b887ac3ac774088be4 (diff) | |
Revert "Install resource files into a share/ directory"
This reverts commit r322256: broke the dfsan build.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@322261 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | cmake/Modules/AddCompilerRT.cmake | 4 | ||||
| -rw-r--r-- | lib/dfsan/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake index 21f8fa794..139b61400 100644 --- a/cmake/Modules/AddCompilerRT.cmake +++ b/cmake/Modules/AddCompilerRT.cmake @@ -431,7 +431,7 @@ endfunction() macro(add_compiler_rt_resource_file target_name file_name component) set(src_file "${CMAKE_CURRENT_SOURCE_DIR}/${file_name}") - set(dst_file "${COMPILER_RT_OUTPUT_DIR}/share/${file_name}") + set(dst_file "${COMPILER_RT_OUTPUT_DIR}/${file_name}") add_custom_command(OUTPUT ${dst_file} DEPENDS ${src_file} COMMAND ${CMAKE_COMMAND} -E copy_if_different ${src_file} ${dst_file} @@ -439,7 +439,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}/share + DESTINATION ${COMPILER_RT_INSTALL_PATH} COMPONENT ${component}) add_dependencies(${component} ${target_name}) diff --git a/lib/dfsan/CMakeLists.txt b/lib/dfsan/CMakeLists.txt index 2df18ce0d..2c486bff8 100644 --- a/lib/dfsan/CMakeLists.txt +++ b/lib/dfsan/CMakeLists.txt @@ -32,7 +32,7 @@ foreach(arch ${DFSAN_SUPPORTED_ARCH}) clang_rt.dfsan-${arch}-symbols) endforeach() -set(dfsan_abilist_filename ${COMPILER_RT_OUTPUT_DIR}/share/dfsan_abilist.txt) +set(dfsan_abilist_filename ${COMPILER_RT_OUTPUT_DIR}/dfsan_abilist.txt) add_custom_target(dfsan_abilist ALL DEPENDS ${dfsan_abilist_filename}) add_custom_command(OUTPUT ${dfsan_abilist_filename} @@ -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}/share) + DESTINATION ${COMPILER_RT_INSTALL_PATH}) |