@@ -1185,22 +1185,6 @@ if [[ ! "${SKIP_BUILD_PLAYGROUNDSUPPORT}" && ! -d ${PLAYGROUNDSUPPORT_SOURCE_DIR
1185
1185
exit 1
1186
1186
fi
1187
1187
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
-
1204
1188
PRODUCTS=(cmark llvm)
1205
1189
if [[ ! " ${SKIP_BUILD_LIBCXX} " ]] ; then
1206
1190
PRODUCTS=(" ${PRODUCTS[@]} " libcxx)
@@ -1693,17 +1677,14 @@ for host in "${ALL_HOSTS[@]}"; do
1693
1677
-DLLVM_INCLUDE_DOCS:BOOL=TRUE
1694
1678
-DLLVM_ENABLE_LTO:STRING=" ${LLVM_ENABLE_LTO} "
1695
1679
-DCOMPILER_RT_INTERCEPT_LIBDISPATCH=ON
1680
+ -DLLVM_ENABLE_PROJECTS=" clang;clang-tools-extra;compiler-rt;"
1696
1681
" ${llvm_cmake_options[@]} "
1697
1682
)
1698
1683
1699
1684
cmake_options+=(
1700
1685
-DLLVM_TOOL_LLD_BUILD:BOOL=TRUE
1701
1686
)
1702
1687
1703
- cmake_options+=(
1704
- -DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR=" ${CLANG_TOOLS_EXTRA_SOURCE_DIR} "
1705
- )
1706
-
1707
1688
if [[ " ${BUILD_TOOLCHAIN_ONLY} " ]]; then
1708
1689
cmake_options+=(
1709
1690
-DLLVM_BUILD_TOOLS=NO
0 commit comments