File tree Expand file tree Collapse file tree 1 file changed +4
-6
lines changed Expand file tree Collapse file tree 1 file changed +4
-6
lines changed Original file line number Diff line number Diff line change @@ -2821,12 +2821,10 @@ for host in "${ALL_HOSTS[@]}"; do
2821
2821
# place during the cmake step of LLVM's build when libcxx is in
2822
2822
# tree... but we are not building llvm with libcxx in tree when we build
2823
2823
# swift. So we need to do configure's work here.
2824
- if [[ " ${product} " == " llvm" ]]; then
2825
- # Find the location of the c++ header dir.
2826
- if [[ " $( uname -s) " == " Darwin" ]] ; then
2827
- HOST_CXX_DIR=$( dirname " ${HOST_CXX} " )
2828
- HOST_CXX_HEADERS_DIR=" $HOST_CXX_DIR /../../usr/include/c++"
2829
- elif [[ " $( uname -s) " == " Haiku" ]] ; then
2824
+ # We don't need this for Darwin since libcxx is present in the SDKs already,
2825
+ # and clang knows how to find it there
2826
+ if [[ " ${product} " == " llvm" && " $( uname -s) " != " Darwin" ]]; then
2827
+ if [[ " $( uname -s) " == " Haiku" ]] ; then
2830
2828
HOST_CXX_HEADERS_DIR=" /boot/system/develop/headers/c++"
2831
2829
elif [[ " ${ANDROID_DATA} " ]] ; then
2832
2830
# This means we're building natively on Android in the Termux
You can’t perform that action at this time.
0 commit comments