1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

common.gypi: don't nest "target_defaults" within "target_defaults"

Browse Source 
The "conditions" block is already within a "target_defaults", so its
children amend target default settings already.
This commit is contained in:
Evan Martin 2011-08-23 10:40:51 -07:00 committed by Ryan Dahl
parent 485d5b5dff
commit a916d888f2
1 changed files with 48 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common.gypi
View File

@ -104,7 +104,6 @@
], ],
}], }],
[ 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
'target_defaults': {
'cflags': [ '-Wall', '-pthread', '-fno-rtti', '-fno-exceptions' ], 'cflags': [ '-Wall', '-pthread', '-fno-rtti', '-fno-exceptions' ],
'ldflags': [ '-pthread', ], 'ldflags': [ '-pthread', ],
'conditions': [ 'conditions': [
@ -119,10 +118,8 @@
'cflags': [ '-fvisibility=hidden' ], 'cflags': [ '-fvisibility=hidden' ],
}], }],
], ],
},
}], }],
['OS=="mac"', { ['OS=="mac"', {
'target_defaults': {
'xcode_settings': { 'xcode_settings': {
'ALWAYS_SEARCH_USER_PATHS': 'NO', 'ALWAYS_SEARCH_USER_PATHS': 'NO',
'GCC_C_LANGUAGE_STANDARD': 'ansi', # -ansi 'GCC_C_LANGUAGE_STANDARD': 'ansi', # -ansi
@ -158,8 +155,7 @@
'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']}, 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']},
}], }],
], ],
},
}], }],
], ],
}, }
} }