From d94d6d536356c92635edc31f0952f52cae39d43f Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Tue, 22 Jan 2019 18:50:33 -0800 Subject: [PATCH] osx builder: add -stdlib=libc++ to CFLAGS/LDFLAGS Although this is a C++ option, some dists like ninja use CFLAGS instead of CXXFLAGS for C++ code, and this becomes even more problematic with XCode 10 which removes libstdc++ entirely. --- tools/osx/builder | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/osx/builder b/tools/osx/builder index 3a990479..deeedb26 100755 --- a/tools/osx/builder +++ b/tools/osx/builder @@ -35,10 +35,10 @@ export COMMAND_MODE=unix2003 export CC=clang export CXX=clang++ export CPPFLAGS="-DICONV_CONST=" -export CFLAGS="-m${target_bits} -framework Carbon -framework Foundation -framework CoreServices -Wno-unused-command-line-argument -DICONV_CONST= -Wl,-no_compact_unwind" +export CFLAGS="-m${target_bits} -framework Carbon -framework Foundation -framework CoreServices -stdlib=libc++ -Wno-unused-command-line-argument -DICONV_CONST= -Wl,-no_compact_unwind" export CXXFLAGS="-m${target_bits} -stdlib=libc++ -framework Carbon -framework Foundation -framework CoreServices -Wno-unused-command-line-argument -DICONV_CONST= -Wl,-no_compact_unwind" export OBJCXXFLAGS="-m${target_bits} -stdlib=libc++ -framework Carbon -framework Foundation -framework CoreServices -Wno-unused-command-line-argument -DICONV_CONST= -Wl,-no_compact_unwind" -export LDFLAGS="-m${target_bits} -framework Carbon -framework Foundation -framework CoreServices -Wno-unused-command-line-argument -Wl,-no_compact_unwind" +export LDFLAGS="-m${target_bits} -framework Carbon -framework Foundation -framework CoreServices -stdlib=libc++ -Wno-unused-command-line-argument -Wl,-no_compact_unwind" export UUID_CFLAGS="-I\$BUILD_ROOT/root/stow/libuuid/include" export UUID_LIBS="-L\$BUILD_ROOT/root/stow/libuuid/lib -luuid"