Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index b75b7fbbe3df7ba32af8e27056073aa9a95b7441..e7b0527c34f39c8c13b86878f6ad5da0b8425d50 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -5260,26 +5260,6 @@ |
}, # configuration "Release" |
}, # configurations |
'xcode_settings': { |
- # Tell the compiler to use libc++'s headers and the linker to link |
- # against libc++. The latter part normally requires OS X 10.7, but |
- # we still support running on 10.6. How does this work? Two parts: |
- # 1. Chromium's clang doesn't error on -mmacosx-version-min=10.6 |
- # combined with -stdlib=libc++ (it normally silently produced a |
- # binary that doesn't run on 10.6) |
- # 2. Further down, library_dirs is set to third_party/libc++-static, |
- # which contains a static libc++.a library. The linker then links |
- # against that instead of against /usr/lib/libc++.dylib when it |
- # sees the -lc++ flag added by the driver. |
- # |
- # In component builds, just link to the system libc++. |
- # This has the effect of making everything depend on libc++, which |
- # means component-build binaries won't run on 10.6 (no libc++ there), |
- # but for a developer-only configuration that's ok. (We don't want |
- # to raise the deployment target yet so that official and dev builds |
- # have the same deployment target. This affects things like which |
- # functions are considered deprecated.) |
- 'CLANG_CXX_LIBRARY': 'libc++', # -stdlib=libc++ |
- |
'GCC_DYNAMIC_NO_PIC': 'NO', # No -mdynamic-no-pic |
# (Equivalent to -fPIC) |
# MACOSX_DEPLOYMENT_TARGET maps to -mmacosx-version-min |
@@ -5296,18 +5276,23 @@ |
# specified or not. |
'-fno-strict-aliasing', # See http://crbug.com/32204. |
], |
+ 'conditions': [ |
+ ['component=="shared_library"', { |
+ # In component builds, link to the system libc++. This requires |
+ # OS X 10.7, but we currently pass -mmacosx-version-min=10.6. |
+ # Xcode's clang complains about this, but our open-source bundled |
+ # chromium clang doesn't. This has the effect of making |
+ # everything depend on libc++, which means component-build |
+ # binaries won't run on 10.6 (no libc++ there), but for a |
+ # developer-only configuration that's ok. |
+ # (We don't want to raise the deployment target yet so that |
+ # official and dev builds have the same deployment target. This |
+ # affects things like which functions are considered deprecated.) |
+ 'CLANG_CXX_LIBRARY': 'libc++', # -stdlib=libc++ |
+ }], |
+ ], |
}, |
'target_conditions': [ |
- ['>(nacl_untrusted_build)==0 and component=="static_library" and asan==0', { |
- # See the comment for CLANG_CXX_LIBRARY above for what this does. |
- # The NaCl toolchains have their own toolchain and don't need this. |
- # ASan requires 10.7+ and clang implicitly adds -lc++abi in ASan |
- # mode. Our libc++.a contains both libc++ and libc++abi in one |
- # library, so it doesn't work in that mode. |
- 'library_dirs': [ |
- '<(DEPTH)/third_party/libc++-static', |
- ], |
- }], |
['_type=="executable"', { |
'postbuilds': [ |
{ |