diff options
| author | Petr Hosek <phosek@chromium.org> | 2018-01-11 00:12:03 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2018-01-11 00:12:03 +0000 |
| commit | b00060137e80d9a8b021d037e3f58fdef713f91d (patch) | |
| tree | 3e251a92cb0fbd489d65567634835a2264355f8f | |
| parent | aaf4da6c1041a1498b95611263002925f4b07010 (diff) | |
| download | bcm5719-llvm-b00060137e80d9a8b021d037e3f58fdef713f91d.tar.gz bcm5719-llvm-b00060137e80d9a8b021d037e3f58fdef713f91d.zip | |
Revert "Install resource files into a share/ directory"
This reverts commit r322234: this is breaking dfsan tests.
llvm-svn: 322243
| -rw-r--r-- | compiler-rt/cmake/Modules/AddCompilerRT.cmake | 4 | ||||
| -rw-r--r-- | compiler-rt/lib/dfsan/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/compiler-rt/cmake/Modules/AddCompilerRT.cmake index 21f8fa794d8..139b6140011 100644 --- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake +++ b/compiler-rt/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/compiler-rt/lib/dfsan/CMakeLists.txt b/compiler-rt/lib/dfsan/CMakeLists.txt index 1cbc04ff275..2c486bff821 100644 --- a/compiler-rt/lib/dfsan/CMakeLists.txt +++ b/compiler-rt/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}/share) + DESTINATION ${COMPILER_RT_INSTALL_PATH}) |
