Chromium Code Reviews| Index: tools/clang/scripts/update.sh |
| diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh |
| index dac0c55ef43de5f525d87675e4b83713c4566f03..a7d709050e1d4384b40f66da71aa65ff248ce54c 100755 |
| --- a/tools/clang/scripts/update.sh |
| +++ b/tools/clang/scripts/update.sh |
| @@ -474,16 +474,15 @@ LDFLAGS="" |
| # needed, on OS X it requires libc++. clang only automatically links to libc++ |
| # when targeting OS X 10.9+, so add stdlib=libc++ explicitly so clang can run on |
| # OS X versions as old as 10.7. |
| -# TODO(thakis): Some bots are still on 10.6, so for now bundle libc++.dylib. |
| -# Remove this once all bots are on 10.7+, then use --enable-libcpp=yes and |
| -# change deployment_target to 10.7. |
| +# TODO(thakis): Some bots are still on 10.6 (nacl...), so for now bundle |
| +# libc++.dylib. Remove this once all bots are on 10.7+, then use |
| +# -DLLVM_ENABLE_LIBCXX=ON and change deployment_target to 10.7. |
| deployment_target="" |
| if [ "${OS}" = "Darwin" ]; then |
| # When building on 10.9, /usr/include usually doesn't exist, and while |
| # Xcode's clang automatically sets a sysroot, self-built clangs don't. |
| CFLAGS="-isysroot $(xcrun --show-sdk-path)" |
| - CPPFLAGS="${CFLAGS}" |
|
Nico
2015/06/09 23:30:34
This is apparently no longer needed. A local --boo
|
| CXXFLAGS="-stdlib=libc++ -nostdinc++ -I${ABS_LIBCXX_DIR}/include ${CFLAGS}" |
| if [[ -n "${bootstrap}" ]]; then |