[build] Rename clang-headers to clang-resource-headers
Summary:
The current install-clang-headers target installs clang's resource
directory headers. This is different from the install-llvm-headers
target, which installs LLVM's API headers. We want to introduce the
corresponding target to clang, and the natural name for that new target
would be install-clang-headers. Rename the existing target to
install-clang-resource-headers to free up the install-clang-headers name
for the new target, following the discussion on cfe-dev [1].
I didn't find any bots on zorg referencing install-clang-headers. I'll
send out another PSA to cfe-dev to accompany this rename.
[1] http://lists.llvm.org/pipermail/cfe-dev/2019-February/061365.html
Reviewers: beanz, phosek, tstellar, rnk, dim, serge-sans-paille
Subscribers: mgorny, javed.absar, jdoerfert, #sanitizers, openmp-commits, lldb-commits, cfe-commits, llvm-commits
Tags: #clang, #sanitizers, #lldb, #openmp, #llvm
Differential Revision: https://reviews.llvm.org/D58791
llvm-svn: 355340
diff --git a/clang/cmake/caches/Apple-stage2.cmake b/clang/cmake/caches/Apple-stage2.cmake
index c7f3f04..bb52b66 100644
--- a/clang/cmake/caches/Apple-stage2.cmake
+++ b/clang/cmake/caches/Apple-stage2.cmake
@@ -60,7 +60,7 @@
clang
LTO
clang-format
- clang-headers
+ clang-resource-headers
cxx-headers
${LLVM_TOOLCHAIN_TOOLS}
CACHE STRING "")
diff --git a/clang/cmake/caches/BaremetalARM.cmake b/clang/cmake/caches/BaremetalARM.cmake
index d9d2efc..85295d9 100644
--- a/clang/cmake/caches/BaremetalARM.cmake
+++ b/clang/cmake/caches/BaremetalARM.cmake
@@ -41,7 +41,7 @@
set(LLVM_DISTRIBUTION_COMPONENTS
clang
lld
- clang-headers
+ clang-resource-headers
builtins-armv6m-none-eabi
builtins-armv7m-none-eabi
builtins-armv7em-none-eabi
diff --git a/clang/cmake/caches/DistributionExample-stage2.cmake b/clang/cmake/caches/DistributionExample-stage2.cmake
index 600ba56..305139c 100644
--- a/clang/cmake/caches/DistributionExample-stage2.cmake
+++ b/clang/cmake/caches/DistributionExample-stage2.cmake
@@ -23,7 +23,7 @@
clang
LTO
clang-format
- clang-headers
+ clang-resource-headers
builtins
runtimes
${LLVM_TOOLCHAIN_TOOLS}
diff --git a/clang/cmake/caches/Fuchsia-stage2.cmake b/clang/cmake/caches/Fuchsia-stage2.cmake
index 8696aed..51efb2d 100644
--- a/clang/cmake/caches/Fuchsia-stage2.cmake
+++ b/clang/cmake/caches/Fuchsia-stage2.cmake
@@ -167,7 +167,7 @@
LTO
clang-apply-replacements
clang-format
- clang-headers
+ clang-resource-headers
clang-include-fixer
clang-refactor
clang-tidy
diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake
index d225d2e..5ff2e8b 100644
--- a/clang/cmake/modules/AddClang.cmake
+++ b/clang/cmake/modules/AddClang.cmake
@@ -133,7 +133,7 @@
endif()
add_clang_executable(${name} ${ARGN})
- add_dependencies(${name} clang-headers)
+ add_dependencies(${name} clang-resource-headers)
if (CLANG_BUILD_TOOLS)
if(${name} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR
diff --git a/clang/docs/LibTooling.rst b/clang/docs/LibTooling.rst
index 498baa2..2aaa508 100644
--- a/clang/docs/LibTooling.rst
+++ b/clang/docs/LibTooling.rst
@@ -187,8 +187,8 @@
does. Thus, the default location to look for builtin headers is in a path
``$(dirname /path/to/tool)/../lib/clang/3.3/include`` relative to the tool
binary. This works out-of-the-box for tools running from llvm's toplevel
-binary directory after building clang-headers, or if the tool is running from
-the binary directory of a clang install next to the clang binary.
+binary directory after building clang-resource-headers, or if the tool is
+running from the binary directory of a clang install next to the clang binary.
Tips: if your tool fails to find ``stddef.h`` or similar headers, call the tool
with ``-v`` and look at the search paths it looks through.
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index 578dc10..1ca6218 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -131,7 +131,7 @@
- ...
OpenMP Support in Clang
-----------------------------------
+-----------------------
- Added emission of the debug information for NVPTX target devices.
@@ -147,6 +147,17 @@
Clang. If upgrading an external codebase that uses Clang as a library,
this section should help get you past the largest hurdles of upgrading.
+Build System Changes
+--------------------
+
+These are major changes to the build system that have happened since the 8.0.0
+release of Clang. Users of the build system should adjust accordingly.
+
+- In 8.0.0 and below, the install-clang-headers target would install clang's
+ resource directory headers. This installation is now performed by the
+ install-clang-resource-headers target. Users of the old install-clang-headers
+ target should switch to the new install-clang-resource-headers target.
+
- ...
AST Matchers
diff --git a/clang/examples/clang-interpreter/CMakeLists.txt b/clang/examples/clang-interpreter/CMakeLists.txt
index b69a82e..ae2c087 100644
--- a/clang/examples/clang-interpreter/CMakeLists.txt
+++ b/clang/examples/clang-interpreter/CMakeLists.txt
@@ -16,7 +16,7 @@
)
add_dependencies(clang-interpreter
- clang-headers
+ clang-resource-headers
)
target_link_libraries(clang-interpreter
diff --git a/clang/lib/Headers/CMakeLists.txt b/clang/lib/Headers/CMakeLists.txt
index 6b2f069..47efed7 100644
--- a/clang/lib/Headers/CMakeLists.txt
+++ b/clang/lib/Headers/CMakeLists.txt
@@ -157,8 +157,8 @@
# Generate arm_fp16.h
clang_generate_header(-gen-arm-fp16 arm_fp16.td arm_fp16.h)
-add_custom_target(clang-headers ALL DEPENDS ${out_files})
-set_target_properties(clang-headers PROPERTIES
+add_custom_target(clang-resource-headers ALL DEPENDS ${out_files})
+set_target_properties(clang-resource-headers PROPERTIES
FOLDER "Misc"
RUNTIME_OUTPUT_DIRECTORY "${output_dir}")
@@ -167,10 +167,10 @@
install(
DIRECTORY ${output_dir}
DESTINATION ${header_install_dir}
- COMPONENT clang-headers)
+ COMPONENT clang-resource-headers)
if (NOT LLVM_ENABLE_IDE)
- add_llvm_install_targets(install-clang-headers
- DEPENDS clang-headers
- COMPONENT clang-headers)
+ add_llvm_install_targets(install-clang-resource-headers
+ DEPENDS clang-resource-headers
+ COMPONENT clang-resource-headers)
endif()
diff --git a/clang/test/CMakeLists.txt b/clang/test/CMakeLists.txt
index 7d9dc42..8874313 100644
--- a/clang/test/CMakeLists.txt
+++ b/clang/test/CMakeLists.txt
@@ -46,7 +46,7 @@
endif ()
list(APPEND CLANG_TEST_DEPS
- clang clang-headers
+ clang clang-resource-headers
clang-format
c-index-test diagtool
clang-tblgen
diff --git a/clang/tools/driver/CMakeLists.txt b/clang/tools/driver/CMakeLists.txt
index 89a3aa3..30ab163 100644
--- a/clang/tools/driver/CMakeLists.txt
+++ b/clang/tools/driver/CMakeLists.txt
@@ -60,7 +60,7 @@
export_executable_symbols(clang)
endif()
-add_dependencies(clang clang-headers)
+add_dependencies(clang clang-resource-headers)
if(NOT CLANG_LINKS_TO_CREATE)
set(CLANG_LINKS_TO_CREATE clang++ clang-cl clang-cpp)
diff --git a/clang/tools/libclang/CMakeLists.txt b/clang/tools/libclang/CMakeLists.txt
index 853b5e6..2de5b29 100644
--- a/clang/tools/libclang/CMakeLists.txt
+++ b/clang/tools/libclang/CMakeLists.txt
@@ -92,7 +92,7 @@
add_clang_library(libclang ${ENABLE_SHARED} ${ENABLE_STATIC}
OUTPUT_NAME ${output_name}
${SOURCES}
- DEPENDS clang-headers
+ DEPENDS clang-resource-headers
LINK_LIBS
${LIBS}