Skip to content

Commit

Permalink
Merge pull request apple#32918 from nathawes/make-libcxx-build-a-noop
Browse files Browse the repository at this point in the history
[build-script-impl] Simplify libcxx build step
  • Loading branch information
nathawes committed Jul 16, 2020
2 parents a907a15 + 90594ee commit a8b41d3
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions utils/build-script-impl
Expand Up @@ -1661,19 +1661,11 @@ for host in "${ALL_HOSTS[@]}"; do
;;

libcxx)
build_targets=(cxx-headers)
build_targets=()
cmake_options=(
"${cmake_options[@]}"
-DCMAKE_C_FLAGS="$(llvm_c_flags ${host})"
-DCMAKE_CXX_FLAGS="$(llvm_c_flags ${host})"
-DCMAKE_C_FLAGS_RELWITHDEBINFO="-O2 -DNDEBUG"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-O2 -DNDEBUG"
-DCMAKE_BUILD_TYPE:STRING="${LLVM_BUILD_TYPE}"
-DLLVM_INCLUDE_DOCS:BOOL=TRUE
-DLLVM_CONFIG_PATH="$(build_directory "${LOCAL_HOST}" llvm)/bin/llvm-config"
"${llvm_cmake_options[@]}"
)

;;

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

if [[ "${product}" == "libcxx" ]]; then
continue
fi

# When we are building LLVM create symlinks to the c++ headers. We need
# to do this before building LLVM since compiler-rt depends on being
# built with the just built clang compiler. These are normally put into
Expand Down

0 comments on commit a8b41d3

Please sign in to comment.