Skip to content

Commit a8b41d3

Browse files
author
Nathan Hawes
authored
Merge pull request swiftlang#32918 from nathawes/make-libcxx-build-a-noop
[build-script-impl] Simplify libcxx build step
2 parents a907a15 + 90594ee commit a8b41d3

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

utils/build-script-impl

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1661,19 +1661,11 @@ for host in "${ALL_HOSTS[@]}"; do
16611661
;;
16621662

16631663
libcxx)
1664-
build_targets=(cxx-headers)
1664+
build_targets=()
16651665
cmake_options=(
16661666
"${cmake_options[@]}"
1667-
-DCMAKE_C_FLAGS="$(llvm_c_flags ${host})"
1668-
-DCMAKE_CXX_FLAGS="$(llvm_c_flags ${host})"
1669-
-DCMAKE_C_FLAGS_RELWITHDEBINFO="-O2 -DNDEBUG"
1670-
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-O2 -DNDEBUG"
1671-
-DCMAKE_BUILD_TYPE:STRING="${LLVM_BUILD_TYPE}"
1672-
-DLLVM_INCLUDE_DOCS:BOOL=TRUE
1673-
-DLLVM_CONFIG_PATH="$(build_directory "${LOCAL_HOST}" llvm)/bin/llvm-config"
16741667
"${llvm_cmake_options[@]}"
16751668
)
1676-
16771669
;;
16781670

16791671
swift)
@@ -2303,6 +2295,10 @@ for host in "${ALL_HOSTS[@]}"; do
23032295
call env "${EXTRA_DISTCC_OPTIONS[@]}" "${CMAKE}" "${cmake_options[@]}" "${EXTRA_CMAKE_OPTIONS[@]}" "${source_dir}"
23042296
fi
23052297

2298+
if [[ "${product}" == "libcxx" ]]; then
2299+
continue
2300+
fi
2301+
23062302
# When we are building LLVM create symlinks to the c++ headers. We need
23072303
# to do this before building LLVM since compiler-rt depends on being
23082304
# built with the just built clang compiler. These are normally put into

0 commit comments

Comments
 (0)