From a916d888f2ea67e47e01d84500276c20149afea1 Mon Sep 17 00:00:00 2001
From: Evan Martin <martine@danga.com>
Date: Tue, 23 Aug 2011 10:40:51 -0700
Subject: [PATCH] common.gypi: don't nest "target_defaults" within
 "target_defaults"

The "conditions" block is already within a "target_defaults", so its
children amend target default settings already.
---
 common.gypi | 100 +++++++++++++++++++++++++---------------------------
 1 file changed, 48 insertions(+), 52 deletions(-)

diff --git a/common.gypi b/common.gypi
index 638a3270cd..8cbb78f092 100644
--- a/common.gypi
+++ b/common.gypi
@@ -104,62 +104,58 @@
         ],
       }],
       [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-       'target_defaults': {
-         'cflags': [ '-Wall', '-pthread', '-fno-rtti', '-fno-exceptions' ],
-         'ldflags': [ '-pthread', ],
-         'conditions': [
-           [ 'target_arch=="ia32"', {
-             'cflags': [ '-m32' ],
-             'ldflags': [ '-m32' ],
-           }],
-           [ 'OS=="linux"', {
-             'cflags': [ '-ansi' ],
-           }],
-           [ 'visibility=="hidden"', {
-             'cflags': [ '-fvisibility=hidden' ],
-           }],
-         ],
-       },
+        'cflags': [ '-Wall', '-pthread', '-fno-rtti', '-fno-exceptions' ],
+        'ldflags': [ '-pthread', ],
+        'conditions': [
+          [ 'target_arch=="ia32"', {
+            'cflags': [ '-m32' ],
+            'ldflags': [ '-m32' ],
+          }],
+          [ 'OS=="linux"', {
+            'cflags': [ '-ansi' ],
+          }],
+          [ 'visibility=="hidden"', {
+            'cflags': [ '-fvisibility=hidden' ],
+          }],
+        ],
       }],
       ['OS=="mac"', {
-        'target_defaults': {
-          'xcode_settings': {
-            'ALWAYS_SEARCH_USER_PATHS': 'NO',
-            'GCC_C_LANGUAGE_STANDARD': 'ansi',        # -ansi
-            'GCC_CW_ASM_SYNTAX': 'NO',                # No -fasm-blocks
-            'GCC_DYNAMIC_NO_PIC': 'NO',               # No -mdynamic-no-pic
-                                                      # (Equivalent to -fPIC)
-            'GCC_ENABLE_CPP_EXCEPTIONS': 'NO',        # -fno-exceptions
-            'GCC_ENABLE_CPP_RTTI': 'NO',              # -fno-rtti
-            'GCC_ENABLE_PASCAL_STRINGS': 'NO',        # No -mpascal-strings
-            # GCC_INLINES_ARE_PRIVATE_EXTERN maps to -fvisibility-inlines-hidden
-            'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES',
-            'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES',      # -fvisibility=hidden
-            'GCC_THREADSAFE_STATICS': 'NO',           # -fno-threadsafe-statics
-            'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES',    # -Werror
-            'GCC_VERSION': '4.2',
-            'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES',  # -Wnewline-eof
-            'MACOSX_DEPLOYMENT_TARGET': '10.4',       # -mmacosx-version-min=10.4
-            'PREBINDING': 'NO',                       # No -Wl,-prebind
-            'USE_HEADERMAP': 'NO',
-            'OTHER_CFLAGS': [
-              '-fno-strict-aliasing',
-            ],
-            'WARNING_CFLAGS': [
-              '-Wall',
-              '-Wendif-labels',
-              '-W',
-              '-Wno-unused-parameter',
-              '-Wnon-virtual-dtor',
-            ],
-          },
-          'target_conditions': [
-            ['_type!="static_library"', {
-              'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']},
-            }],
+        'xcode_settings': {
+          'ALWAYS_SEARCH_USER_PATHS': 'NO',
+          'GCC_C_LANGUAGE_STANDARD': 'ansi',        # -ansi
+          'GCC_CW_ASM_SYNTAX': 'NO',                # No -fasm-blocks
+          'GCC_DYNAMIC_NO_PIC': 'NO',               # No -mdynamic-no-pic
+                                                    # (Equivalent to -fPIC)
+          'GCC_ENABLE_CPP_EXCEPTIONS': 'NO',        # -fno-exceptions
+          'GCC_ENABLE_CPP_RTTI': 'NO',              # -fno-rtti
+          'GCC_ENABLE_PASCAL_STRINGS': 'NO',        # No -mpascal-strings
+          # GCC_INLINES_ARE_PRIVATE_EXTERN maps to -fvisibility-inlines-hidden
+          'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES',
+          'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES',      # -fvisibility=hidden
+          'GCC_THREADSAFE_STATICS': 'NO',           # -fno-threadsafe-statics
+          'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES',    # -Werror
+          'GCC_VERSION': '4.2',
+          'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES',  # -Wnewline-eof
+          'MACOSX_DEPLOYMENT_TARGET': '10.4',       # -mmacosx-version-min=10.4
+          'PREBINDING': 'NO',                       # No -Wl,-prebind
+          'USE_HEADERMAP': 'NO',
+          'OTHER_CFLAGS': [
+            '-fno-strict-aliasing',
+          ],
+          'WARNING_CFLAGS': [
+            '-Wall',
+            '-Wendif-labels',
+            '-W',
+            '-Wno-unused-parameter',
+            '-Wnon-virtual-dtor',
           ],
         },
+        'target_conditions': [
+          ['_type!="static_library"', {
+            'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']},
+          }],
+        ],
       }],
     ],
-  },
+  }
 }