Rename target-specific binaries built for host.

tools/gyp/v8.gyp

Index: tools/gyp/v8.gyp
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index 2d6eaf9d0f220d2a4402c97335dd084dc0c87b27..de2307cdf9b9da5c743c1921eeeb1469fe49869f 100644
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -43,13 +43,13 @@
               # The dependency on v8_base should come from a transitive
               # dependency however the Android toolchain requires libv8_base.a
               # to appear before libv8_snapshot.a so it's listed explicitly.
-              'dependencies': ['v8_base', 'v8_snapshot'],
+              'dependencies': ['v8_base.<(v8_target_arch)', 'v8_snapshot'],

[Jakob Kummerow, 2013/03/21 16:28:32]

I would have assumed that v8_snapshot needs the <(v8_target_arch) treatment too.
Is that not the case?

[Torne, 2013/03/21 17:00:25]

v8_snapshot is not actually built for host in a normal build, so it's not really
necessary (mksnapshot doesn't depend on it). If we rename *everything* that can
be built for host then that would end up being the whole lot including libv8,
which you rightly wanted to avoid.

             },
             {
               # The dependency on v8_base should come from a transitive
               # dependency however the Android toolchain requires libv8_base.a
               # to appear before libv8_snapshot.a so it's listed explicitly.
-              'dependencies': ['v8_base', 'v8_nosnapshot'],
+              'dependencies': ['v8_base.<(v8_target_arch)', 'v8_nosnapshot.<(v8_target_arch)'],

[Jakob Kummerow, 2013/03/21 16:28:32]

nit: please respect 80-col lines where possible (breaking strings is not
necessary).

[Torne, 2013/03/21 17:00:25]

Oops, yes. I shall reformat to 80 cols where reasonably possible.

             }],
             ['component=="shared_library"', {
               'type': '<(component)',
@@ -105,10 +105,10 @@
           'conditions': [
             ['want_separate_host_toolset==1', {
               'toolsets': ['host', 'target'],
-              'dependencies': ['mksnapshot#host', 'js2c#host'],
+              'dependencies': ['mksnapshot.<(v8_target_arch)#host', 'js2c#host'],
             }, {
               'toolsets': ['target'],
-              'dependencies': ['mksnapshot', 'js2c'],
+              'dependencies': ['mksnapshot.<(v8_target_arch)', 'js2c'],
             }],
             ['component=="shared_library"', {
               'defines': [
@@ -124,7 +124,7 @@
             }],
           ],
           'dependencies': [
-            'v8_base',
+            'v8_base.<(v8_target_arch)',
           ],
           'include_dirs+': [
             '../../src',
@@ -138,7 +138,7 @@
             {
               'action_name': 'run_mksnapshot',
               'inputs': [
-                '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
+                '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot.<(v8_target_arch)<(EXECUTABLE_SUFFIX)',
               ],
               'outputs': [
                 '<(INTERMEDIATE_DIR)/snapshot.cc',
@@ -192,10 +192,10 @@
           ],
         },
         {
-          'target_name': 'v8_nosnapshot',
+          'target_name': 'v8_nosnapshot.<(v8_target_arch)',
           'type': 'static_library',
           'dependencies': [
-            'v8_base',
+            'v8_base.<(v8_target_arch)',
           ],
           'include_dirs+': [
             '../../src',
@@ -222,7 +222,7 @@
           ]
         },
         {
-          'target_name': 'v8_base',
+          'target_name': 'v8_base.<(v8_target_arch)',
           'type': 'static_library',
           'variables': {
             'optimize': 'max',
@@ -868,11 +868,11 @@
            ]
         },
         {
-          'target_name': 'mksnapshot',
+          'target_name': 'mksnapshot.<(v8_target_arch)',
           'type': 'executable',
           'dependencies': [
-            'v8_base',
-            'v8_nosnapshot',
+            'v8_base.<(v8_target_arch)',
+            'v8_nosnapshot.<(v8_target_arch)',
           ],
           'include_dirs+': [
             '../../src',