--- build/common.gypi	2014-08-11 19:38:56.000000000 -0700
+++ build/common.gypi.new	2014-08-11 17:35:10.000000000 -0700
@@ -412,7 +412,7 @@
 
       # Use system libc++ instead of the default C++ library, usually libstdc++.
       # This is intended for iOS builds only.
-      'use_system_libcxx%': 0,
+      'use_system_libcxx%': 1,
 
       # Use a modified version of Clang to intercept allocated types and sizes
       # for allocated objects. clang_type_profiler=1 implies clang=1.
@@ -1339,7 +1339,7 @@
 
     # Disable fatal linker warnings, similarly to how we make it possible
     # to disable -Werror (e.g. for different toolchain versions).
-    'disable_fatal_linker_warnings%': 0,
+    'disable_fatal_linker_warnings%': 1,
 
     'release_valgrind_build%': 0,
 
@@ -1562,7 +1562,6 @@
       ['os_posix==1 and OS!="mac" and OS!="ios"', {
         'conditions': [
           ['target_arch=="mipsel"', {
-            'werror%': '',
             'disable_nacl%': 1,
             'nacl_untrusted_build%': 0,
             'use_allocator%': 'none',
@@ -1609,7 +1608,7 @@
         # The Mac SDK is set for iOS builds and passed through to Mac
         # sub-builds. This allows the Mac sub-build SDK in an iOS build to be
         # overridden from the command line the same way it is for a Mac build.
-        'mac_sdk%': '<!(python <(DEPTH)/build/mac/find_sdk.py 10.6)',
+        'mac_sdk%': '<!(python <(DEPTH)/build/mac/find_sdk.py 10.9)',
 
         # iOS SDK and deployment target support.  The |ios_sdk| value is left
         # blank so that when it is set in the project files it will be the
@@ -1842,10 +1841,10 @@
           # someplace that Xcode doesn't know about, set mac_sdk_path to the
           # path to the SDK; when set to a non-empty string, SDK detection
           # based on mac_sdk_min will be bypassed entirely.
-          'mac_sdk_min%': '10.6',
+          'mac_sdk_min%': '10.9',
           'mac_sdk_path%': '',
 
-          'mac_deployment_target%': '10.6',
+          'mac_deployment_target%': '10.9',
         },
 
         'mac_sdk_min': '<(mac_sdk_min)',
@@ -2187,7 +2186,6 @@
 
         'use_allocator': 'tcmalloc',
         'release_valgrind_build': 1,
-        'werror': '',
         'component': 'static_library',
         'use_system_zlib': 0,
       }],
@@ -2961,7 +2959,6 @@
           # TODO: Fix all warnings on chromeos too.
           [ 'os_posix==1 and OS!="mac" and OS!="ios" and (clang!=1 or chromeos==1)', {
             'cflags!': [
-              '-Werror',
             ],
           }],
           [ 'os_posix==1 and os_bsd!=1 and OS!="mac" and OS!="android"', {
@@ -3426,14 +3423,12 @@
         # Enable -Werror by default, but put it in a variable so it can
         # be disabled in ~/.gyp/include.gypi on the valgrind builders.
         'variables': {
-          'werror%': '-Werror',
           'libraries_for_target%': '',
         },
         'defines': [
           '_FILE_OFFSET_BITS=64',
         ],
         'cflags': [
-          '<(werror)',  # See note above about the werror variable.
           '-pthread',
           '-fno-exceptions',
           '-fno-strict-aliasing',  # See http://crbug.com/32204
@@ -4669,7 +4664,7 @@
           'GCC_OBJC_CALL_CXX_CDTORS': 'YES',        # -fobjc-call-cxx-cdtors
           'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES',      # -fvisibility=hidden
           'GCC_THREADSAFE_STATICS': 'NO',           # -fno-threadsafe-statics
-          'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES',    # -Werror
+          'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO',    # -Werror
           'GCC_VERSION': '4.2',
           'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES',  # -Wnewline-eof
           'USE_HEADERMAP': 'NO',