build: make default_configuration consistent with BUILDTYPE

nodejs · Feb 23, 2012 · 680d75a · 680d75a
1 parent b92a919
commit 680d75a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/common.gypi b/common.gypi
@@ -10,7 +10,6 @@
   },
 
   'target_defaults': {
-    'default_configuration': 'Debug',
     'configurations': {
       'Debug': {
         'defines': [ 'DEBUG', '_DEBUG' ],

diff --git a/configure b/configure
@@ -189,6 +189,7 @@ def configure_node(o):
   o['variables']['node_install_waf'] = b(not options.without_waf)
   o['variables']['host_arch'] = host_arch()
   o['variables']['target_arch'] = options.dest_cpu or target_arch()
+  o['default_configuration'] = 'Debug' if options.debug else 'Release'
 
   # TODO move to node.gyp
   if sys.platform == 'sunos5':

diff --git a/tools/gyp_addon b/tools/gyp_addon
@@ -12,8 +12,10 @@ if __name__ == '__main__':
   args = sys.argv[1:]
   addon_gypi = os.path.join(node_root, 'tools', 'addon.gypi')
   common_gypi = os.path.join(node_root, 'common.gypi')
+  config_gypi = os.path.join(node_root, 'config.gypi')
   args.extend(['-I', addon_gypi])
   args.extend(['-I', common_gypi])
+  args.extend(['-I', config_gypi])
   args.extend(['-Dlibrary=shared_library'])
   args.extend(['-Dvisibility=default'])
   args.extend(['-Dnode_root_dir=%s' % node_root])