0
0
mirror of https://github.com/nodejs/node.git synced 2024-11-24 20:29:23 +01:00

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.
This commit is contained in:
Evan Martin 2011-08-23 10:40:51 -07:00 committed by Ryan Dahl
parent 485d5b5dff
commit a916d888f2

View File

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