1
0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-25 04:02:41 +01:00

[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
This commit is contained in:
Shoaib Meenai 2019-03-04 21:19:53 +00:00
parent aff4683104
commit f5bbfca8c1
3 changed files with 10 additions and 10 deletions

View File

@ -79,7 +79,7 @@ compiled by the system compiler in the debian8 image:
./llvm/utils/docker/build_docker_image.sh \ ./llvm/utils/docker/build_docker_image.sh \
--source debian8 \ --source debian8 \
--docker-repository clang-debian8 --docker-tag "staging" \ --docker-repository clang-debian8 --docker-tag "staging" \
-p clang -i install-clang -i install-clang-headers \ -p clang -i install-clang -i install-clang-resource-headers \
-- \ -- \
-DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release
@ -95,11 +95,11 @@ this command will do that:
./build_docker_image.sh \ ./build_docker_image.sh \
--source debian8 \ --source debian8 \
--docker-repository clang-debian8 --docker-tag "staging" \ --docker-repository clang-debian8 --docker-tag "staging" \
-p clang -i stage2-install-clang -i stage2-install-clang-headers \ -p clang -i stage2-install-clang -i stage2-install-clang-resource-headers \
-- \ -- \
-DLLVM_TARGETS_TO_BUILD=Native -DCMAKE_BUILD_TYPE=Release \ -DLLVM_TARGETS_TO_BUILD=Native -DCMAKE_BUILD_TYPE=Release \
-DBOOTSTRAP_CMAKE_BUILD_TYPE=Release \ -DBOOTSTRAP_CMAKE_BUILD_TYPE=Release \
-DCLANG_ENABLE_BOOTSTRAP=ON -DCLANG_BOOTSTRAP_TARGETS="install-clang;install-clang-headers" -DCLANG_ENABLE_BOOTSTRAP=ON -DCLANG_BOOTSTRAP_TARGETS="install-clang;install-clang-resource-headers"
This will produce a new image ``clang-debian8:staging`` from the latest This will produce a new image ``clang-debian8:staging`` from the latest
upstream revision. upstream revision.
@ -165,7 +165,7 @@ debian8-based image using the latest ``google/stable`` sources for you:
./llvm/utils/docker/build_docker_image.sh \ ./llvm/utils/docker/build_docker_image.sh \
-s debian8 --d clang-debian8 -t "staging" \ -s debian8 --d clang-debian8 -t "staging" \
--branch branches/google/stable \ --branch branches/google/stable \
-p clang -i install-clang -i install-clang-headers \ -p clang -i install-clang -i install-clang-resource-headers \
-- \ -- \
-DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release

View File

@ -273,11 +273,11 @@ else() # if this is included from LLVM's CMake
if(compiler_rt_path) if(compiler_rt_path)
if(NOT LLVM_BUILTIN_TARGETS) if(NOT LLVM_BUILTIN_TARGETS)
builtin_default_target(${compiler_rt_path} builtin_default_target(${compiler_rt_path}
DEPENDS clang-headers) DEPENDS clang-resource-headers)
else() else()
if("default" IN_LIST LLVM_BUILTIN_TARGETS) if("default" IN_LIST LLVM_BUILTIN_TARGETS)
builtin_default_target(${compiler_rt_path} builtin_default_target(${compiler_rt_path}
DEPENDS clang-headers) DEPENDS clang-resource-headers)
list(REMOVE_ITEM LLVM_BUILTIN_TARGETS "default") list(REMOVE_ITEM LLVM_BUILTIN_TARGETS "default")
else() else()
add_custom_target(builtins) add_custom_target(builtins)
@ -287,7 +287,7 @@ else() # if this is included from LLVM's CMake
foreach(target ${LLVM_BUILTIN_TARGETS}) foreach(target ${LLVM_BUILTIN_TARGETS})
builtin_register_target(${compiler_rt_path} ${target} builtin_register_target(${compiler_rt_path} ${target}
DEPENDS clang-headers) DEPENDS clang-resource-headers)
add_dependencies(builtins builtins-${target}) add_dependencies(builtins builtins-${target})
add_dependencies(install-builtins install-builtins-${target}) add_dependencies(install-builtins install-builtins-${target})

View File

@ -55,7 +55,7 @@ All options after '--' are passed to CMake invocation.
For example, running: For example, running:
$ build_docker_image.sh -s debian8 -d mydocker/debian8-clang -t latest \ $ build_docker_image.sh -s debian8 -d mydocker/debian8-clang -t latest \
-p clang -i install-clang -i install-clang-headers -p clang -i install-clang -i install-clang-resource-headers
will produce two docker images: will produce two docker images:
mydocker/debian8-clang-build:latest - an intermediate image used to compile mydocker/debian8-clang-build:latest - an intermediate image used to compile
clang. clang.
@ -66,12 +66,12 @@ version of clang.
To get a 2-stage clang build, you could use this command: To get a 2-stage clang build, you could use this command:
$ ./build_docker_image.sh -s debian8 -d mydocker/clang-debian8 -t "latest" \ $ ./build_docker_image.sh -s debian8 -d mydocker/clang-debian8 -t "latest" \
-p clang -i stage2-install-clang -i stage2-install-clang-headers \ -p clang -i stage2-install-clang -i stage2-install-clang-resource-headers \
-- \ -- \
-DLLVM_TARGETS_TO_BUILD=Native -DCMAKE_BUILD_TYPE=Release \ -DLLVM_TARGETS_TO_BUILD=Native -DCMAKE_BUILD_TYPE=Release \
-DBOOTSTRAP_CMAKE_BUILD_TYPE=Release \ -DBOOTSTRAP_CMAKE_BUILD_TYPE=Release \
-DCLANG_ENABLE_BOOTSTRAP=ON \ -DCLANG_ENABLE_BOOTSTRAP=ON \
-DCLANG_BOOTSTRAP_TARGETS="install-clang;install-clang-headers" -DCLANG_BOOTSTRAP_TARGETS="install-clang;install-clang-resource-headers"
EOF EOF
} }