forked from OSchip/llvm-project
[libc++] Disable modules with the bootstrapping build
It turns out that we had never been enabling it anyways, since the LIBCXX_TEST_PARAMS parameter was not being passed from the bootstrapping build to the libc++ and libc++abi builds. Furthermore, it looks like the per-target include directories used by the bootstrapping build by default are incompatible with our current modulemap, since __config_site doesn't live in the directory that our modulemap claims. This disables modules in our bootstrapping CI job to unblock D121822, but we should work on fixing the underlying issue once we're able to pass those configuration options to our bootstrapping build.
This commit is contained in:
parent
da9ba89d48
commit
f2b376f06b
|
@ -450,10 +450,6 @@ bootstrapping-build)
|
|||
clean
|
||||
|
||||
echo "--- Generating CMake"
|
||||
# TODO: We currently enable modules and assertions in the bootstrapping build
|
||||
# because that provides coverage for some specific Clang failures
|
||||
# we've been seeing recently, however it would be better to instead
|
||||
# run all CI configurations against a Clang that has assertions enabled.
|
||||
${CMAKE} \
|
||||
-S "${MONOREPO_ROOT}/llvm" \
|
||||
-B "${BUILD_DIR}" \
|
||||
|
@ -466,7 +462,6 @@ bootstrapping-build)
|
|||
-DLLVM_TARGETS_TO_BUILD="host" \
|
||||
-DRUNTIMES_BUILD_ALLOW_DARWIN=ON \
|
||||
-DLLVM_ENABLE_ASSERTIONS=ON \
|
||||
-C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-modules.cmake" \
|
||||
-DRUNTIMES_LIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
|
||||
|
||||
echo "+++ Running the libc++ and libc++abi tests"
|
||||
|
|
Loading…
Reference in New Issue