gyp: fix ninja build on linux

fix nodejs#6679
indutny · Jan 16, 2014 · 61c0d57 · 61c0d57
1 parent abe0255
commit 61c0d57
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/common.gypi b/common.gypi
@@ -19,7 +19,14 @@
     'conditions': [
       ['OS != "win"', {
         'v8_postmortem_support': 'true'
-      }]
+      }],
+      ['GENERATOR == "ninja"', {
+        'OBJ_DIR': '<(PRODUCT_DIR)/obj',
+        'V8_BASE': '<(PRODUCT_DIR)/libv8_base.a',
+      }, {
+        'OBJ_DIR': '<(PRODUCT_DIR)/obj.target',
+        'V8_BASE': '<(OBJ_DIR)/deps/v8/tools/gyp/libv8_base.a',
+      }],
     ],
   },
 

diff --git a/node.gyp b/node.gyp
@@ -293,7 +293,7 @@
         [
           'OS=="linux" and node_shared_v8=="false"', {
             'ldflags': [
-              '-Wl,--whole-archive <(PRODUCT_DIR)/obj.target/deps/v8/tools/gyp/libv8_base.a -Wl,--no-whole-archive',
+              '-Wl,--whole-archive <(V8_BASE) -Wl,--no-whole-archive',
             ],
         }],
       ],
@@ -427,10 +427,10 @@
               'action_name': 'node_dtrace_provider_o',
               'inputs': [
                 'src/node_provider.d',
-                '<(PRODUCT_DIR)/obj.target/node/src/node_dtrace.o'
+                '<(OBJ_DIR)/node/src/node_dtrace.o'
               ],
               'outputs': [
-                '<(PRODUCT_DIR)/obj.target/node/src/node_dtrace_provider.o'
+                '<(OBJ_DIR)/node/src/node_dtrace_provider.o'
               ],
               'action': [ 'dtrace', '-G', '-xnolibs', '-s', '<@(_inputs)',
                 '-o', '<@(_outputs)' ]
@@ -448,7 +448,7 @@
             {
               'action_name': 'node_dtrace_ustack_constants',
               'inputs': [
-                '<(PRODUCT_DIR)/obj.target/deps/v8/tools/gyp/libv8_base.a'
+                '<(V8_BASE)'
               ],
               'outputs': [
                 '<(SHARED_INTERMEDIATE_DIR)/v8constants.h'
@@ -466,7 +466,7 @@
                 '<(SHARED_INTERMEDIATE_DIR)/v8constants.h'
               ],
               'outputs': [
-                '<(PRODUCT_DIR)/obj.target/node/src/node_dtrace_ustack.o'
+                '<(OBJ_DIR)/node/src/node_dtrace_ustack.o'
               ],
               'conditions': [
                 [ 'target_arch=="ia32"', {