Skip to content

Commit 1b98a79

Browse files
committed
[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 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@355340 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent c346540 commit 1b98a79

File tree

12 files changed

+29
-18
lines changed

12 files changed

+29
-18
lines changed

cmake/caches/Apple-stage2.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ set(LLVM_DISTRIBUTION_COMPONENTS
6060
clang
6161
LTO
6262
clang-format
63-
clang-headers
63+
clang-resource-headers
6464
cxx-headers
6565
${LLVM_TOOLCHAIN_TOOLS}
6666
CACHE STRING "")

cmake/caches/BaremetalARM.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ set(LLVM_TOOLCHAIN_TOOLS
4141
set(LLVM_DISTRIBUTION_COMPONENTS
4242
clang
4343
lld
44-
clang-headers
44+
clang-resource-headers
4545
builtins-armv6m-none-eabi
4646
builtins-armv7m-none-eabi
4747
builtins-armv7em-none-eabi

cmake/caches/DistributionExample-stage2.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ set(LLVM_DISTRIBUTION_COMPONENTS
2323
clang
2424
LTO
2525
clang-format
26-
clang-headers
26+
clang-resource-headers
2727
builtins
2828
runtimes
2929
${LLVM_TOOLCHAIN_TOOLS}

cmake/caches/Fuchsia-stage2.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ set(LLVM_DISTRIBUTION_COMPONENTS
167167
LTO
168168
clang-apply-replacements
169169
clang-format
170-
clang-headers
170+
clang-resource-headers
171171
clang-include-fixer
172172
clang-refactor
173173
clang-tidy

cmake/modules/AddClang.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ macro(add_clang_tool name)
133133
endif()
134134

135135
add_clang_executable(${name} ${ARGN})
136-
add_dependencies(${name} clang-headers)
136+
add_dependencies(${name} clang-resource-headers)
137137

138138
if (CLANG_BUILD_TOOLS)
139139
if(${name} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR

docs/LibTooling.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@ Clang tools need their builtin headers and search for them the same way Clang
187187
does. Thus, the default location to look for builtin headers is in a path
188188
``$(dirname /path/to/tool)/../lib/clang/3.3/include`` relative to the tool
189189
binary. This works out-of-the-box for tools running from llvm's toplevel
190-
binary directory after building clang-headers, or if the tool is running from
191-
the binary directory of a clang install next to the clang binary.
190+
binary directory after building clang-resource-headers, or if the tool is
191+
running from the binary directory of a clang install next to the clang binary.
192192

193193
Tips: if your tool fails to find ``stddef.h`` or similar headers, call the tool
194194
with ``-v`` and look at the search paths it looks through.

docs/ReleaseNotes.rst

+12-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ ABI Changes in Clang
131131
- ...
132132

133133
OpenMP Support in Clang
134-
----------------------------------
134+
-----------------------
135135

136136
- Added emission of the debug information for NVPTX target devices.
137137

@@ -147,6 +147,17 @@ These are major API changes that have happened since the 8.0.0 release of
147147
Clang. If upgrading an external codebase that uses Clang as a library,
148148
this section should help get you past the largest hurdles of upgrading.
149149

150+
Build System Changes
151+
--------------------
152+
153+
These are major changes to the build system that have happened since the 8.0.0
154+
release of Clang. Users of the build system should adjust accordingly.
155+
156+
- In 8.0.0 and below, the install-clang-headers target would install clang's
157+
resource directory headers. This installation is now performed by the
158+
install-clang-resource-headers target. Users of the old install-clang-headers
159+
target should switch to the new install-clang-resource-headers target.
160+
150161
- ...
151162

152163
AST Matchers

examples/clang-interpreter/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ add_clang_executable(clang-interpreter
1616
)
1717

1818
add_dependencies(clang-interpreter
19-
clang-headers
19+
clang-resource-headers
2020
)
2121

2222
target_link_libraries(clang-interpreter

lib/Headers/CMakeLists.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@ clang_generate_header(-gen-arm-neon arm_neon.td arm_neon.h)
157157
# Generate arm_fp16.h
158158
clang_generate_header(-gen-arm-fp16 arm_fp16.td arm_fp16.h)
159159

160-
add_custom_target(clang-headers ALL DEPENDS ${out_files})
161-
set_target_properties(clang-headers PROPERTIES
160+
add_custom_target(clang-resource-headers ALL DEPENDS ${out_files})
161+
set_target_properties(clang-resource-headers PROPERTIES
162162
FOLDER "Misc"
163163
RUNTIME_OUTPUT_DIRECTORY "${output_dir}")
164164

@@ -167,10 +167,10 @@ set(header_install_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION})
167167
install(
168168
DIRECTORY ${output_dir}
169169
DESTINATION ${header_install_dir}
170-
COMPONENT clang-headers)
170+
COMPONENT clang-resource-headers)
171171

172172
if (NOT LLVM_ENABLE_IDE)
173-
add_llvm_install_targets(install-clang-headers
174-
DEPENDS clang-headers
175-
COMPONENT clang-headers)
173+
add_llvm_install_targets(install-clang-resource-headers
174+
DEPENDS clang-resource-headers
175+
COMPONENT clang-resource-headers)
176176
endif()

test/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ if(CLANG_TEST_USE_VG)
4646
endif ()
4747

4848
list(APPEND CLANG_TEST_DEPS
49-
clang clang-headers
49+
clang clang-resource-headers
5050
clang-format
5151
c-index-test diagtool
5252
clang-tblgen

tools/driver/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ if(CLANG_PLUGIN_SUPPORT)
6060
export_executable_symbols(clang)
6161
endif()
6262

63-
add_dependencies(clang clang-headers)
63+
add_dependencies(clang clang-resource-headers)
6464

6565
if(NOT CLANG_LINKS_TO_CREATE)
6666
set(CLANG_LINKS_TO_CREATE clang++ clang-cl clang-cpp)

tools/libclang/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ endif()
9292
add_clang_library(libclang ${ENABLE_SHARED} ${ENABLE_STATIC}
9393
OUTPUT_NAME ${output_name}
9494
${SOURCES}
95-
DEPENDS clang-headers
95+
DEPENDS clang-resource-headers
9696

9797
LINK_LIBS
9898
${LIBS}

0 commit comments

Comments
 (0)