Skip to content

Commit ba3f582

Browse files
committed
[next] Do not use libcxx standalone build
This was removed in llvm/llvm-project 6f17768e11480063f4c2bcbeea559505fee3ea19. Use new build instead.
1 parent ff42c48 commit ba3f582

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

utils/build-script-impl

+3-2
Original file line numberDiff line numberDiff line change
@@ -1263,7 +1263,7 @@ FOUNDATION_STATIC_SOURCE_DIR="${WORKSPACE}/swift-corelibs-foundation"
12631263
LIBDISPATCH_SOURCE_DIR="${WORKSPACE}/swift-corelibs-libdispatch"
12641264
LIBDISPATCH_STATIC_SOURCE_DIR="${WORKSPACE}/swift-corelibs-libdispatch"
12651265
LIBICU_SOURCE_DIR="${WORKSPACE}/icu"
1266-
LIBCXX_SOURCE_DIR="${WORKSPACE}/llvm-project/libcxx"
1266+
LIBCXX_SOURCE_DIR="${WORKSPACE}/llvm-project/runtimes"
12671267
EXPERIMENTAL_STRING_PROCESSING_SOURCE_DIR="${WORKSPACE}/swift-experimental-string-processing"
12681268
LIBXML2_SOURCE_DIR="${WORKSPACE}/libxml2"
12691269

@@ -1900,8 +1900,9 @@ for host in "${ALL_HOSTS[@]}"; do
19001900
;;
19011901

19021902
libcxx)
1903-
build_targets=()
1903+
build_targets=(cxx)
19041904
cmake_options=(
1905+
-DLLVM_ENABLE_RUNTIMES="libcxx" -DLIBCXX_INSTALL_LIBRARY=OFF
19051906
"${cmake_options[@]}"
19061907
"${llvm_cmake_options[@]}"
19071908
)

0 commit comments

Comments
 (0)