Skip to content

Commit ac4ac89

Browse files
committed
[build] Remove build-script-impl logic to set up project symlinks
Instead of manually setting up symlinks in the project, it would be easier and cleaner to use LLVM_ENABLE_PROJECT.
1 parent 4f98772 commit ac4ac89

File tree

1 file changed

+1
-20
lines changed

1 file changed

+1
-20
lines changed

utils/build-script-impl

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,22 +1185,6 @@ if [[ ! "${SKIP_BUILD_PLAYGROUNDSUPPORT}" && ! -d ${PLAYGROUNDSUPPORT_SOURCE_DIR
11851185
exit 1
11861186
fi
11871187

1188-
# Symlink clang into the llvm tree.
1189-
CLANG_SOURCE_DIR="${LLVM_SOURCE_DIR}/tools/clang"
1190-
if [ ! -d "${CLANG_SOURCE_DIR}" ] ; then
1191-
make_relative_symlink "${WORKSPACE}/llvm-project/clang" "${CLANG_SOURCE_DIR}"
1192-
fi
1193-
1194-
# Don't symlink clang-tools-extra into the tree as the 'clang' symlink prevents
1195-
# make_relative_symlink from working correctly.
1196-
CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKSPACE}/llvm-project/clang-tools-extra"
1197-
1198-
# Symlink compiler-rt into the llvm tree, if it exists.
1199-
COMPILER_RT_SOURCE_DIR="${LLVM_SOURCE_DIR}/projects/compiler-rt"
1200-
if [ ! -d "${COMPILER_RT_SOURCE_DIR}" ] ; then
1201-
make_relative_symlink "${WORKSPACE}/llvm-project/compiler-rt" "${COMPILER_RT_SOURCE_DIR}"
1202-
fi
1203-
12041188
PRODUCTS=(cmark llvm)
12051189
if [[ ! "${SKIP_BUILD_LIBCXX}" ]] ; then
12061190
PRODUCTS=("${PRODUCTS[@]}" libcxx)
@@ -1693,17 +1677,14 @@ for host in "${ALL_HOSTS[@]}"; do
16931677
-DLLVM_INCLUDE_DOCS:BOOL=TRUE
16941678
-DLLVM_ENABLE_LTO:STRING="${LLVM_ENABLE_LTO}"
16951679
-DCOMPILER_RT_INTERCEPT_LIBDISPATCH=ON
1680+
-DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;compiler-rt;"
16961681
"${llvm_cmake_options[@]}"
16971682
)
16981683

16991684
cmake_options+=(
17001685
-DLLVM_TOOL_LLD_BUILD:BOOL=TRUE
17011686
)
17021687

1703-
cmake_options+=(
1704-
-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${CLANG_TOOLS_EXTRA_SOURCE_DIR}"
1705-
)
1706-
17071688
if [[ "${BUILD_TOOLCHAIN_ONLY}" ]]; then
17081689
cmake_options+=(
17091690
-DLLVM_BUILD_TOOLS=NO

0 commit comments

Comments
 (0)