Revert of mac: In static library builds, link against a static libc++.a

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index b35d519c5d70b90cb6c49635a69f86e15210ef81..e7dc6170c65224e50ad30471968433c0cf10f690 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -5256,26 +5256,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
@@ -5292,15 +5272,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"', {
-            # See the comment for CLANG_CXX_LIBRARY above for what this does.
-            # The NaCl toolchains have their own toolchain and don't need this.
-            'library_dirs': [
-              '<(DEPTH)/third_party/libc++-static',
-            ],
-          }],
           ['_type=="executable"', {
             'postbuilds': [
               {