Rename target-specific binaries built for host.

tools/gyp/v8.gyp

 # Copyright 2012 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 25 matching lines @@
           'conditions': [
             ['want_separate_host_toolset==1', {
               'toolsets': ['host', 'target'],
             }, {
               'toolsets': ['target'],
             }],
             ['v8_use_snapshot=="true"', {
               # 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)',
               'sources': [
                 # Note: on non-Windows we still build this file so that gyp
                 # has some sources to link into the component.
                 '../../src/v8dll-main.cc',
               ],
               'defines': [
                 'V8_SHARED',
@@ skipping 35 matching lines @@
               '../../include',
             ],
           },
         },
         {
           'target_name': 'v8_snapshot',
           'type': 'static_library',
           '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': [
                 'V8_SHARED',
                 'BUILDING_V8_SHARED',
               ],
               'direct_dependent_settings': {
                 'defines': [
                   'V8_SHARED',
                   'USING_V8_SHARED',
                 ],
               },
             }],
           ],
           'dependencies': [
-            'v8_base',
+            'v8_base.<(v8_target_arch)',
           ],
           'include_dirs+': [
             '../../src',
           ],
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
             '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
             '<(INTERMEDIATE_DIR)/snapshot.cc',
           ],
           'actions': [
             {
               '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',
               ],
               'variables': {
                 'mksnapshot_flags': [
                   '--log-snapshot-positions',
                   '--logfile', '<(INTERMEDIATE_DIR)/snapshot.log',
                 ],
               },
@@ skipping 33 matching lines @@
               ],
               'action': [
                 '<@(_inputs)',
                 '<@(mksnapshot_flags)',
                 '<@(_outputs)'
               ],
             },
           ],
         },
         {
-          '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',
           ],
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
             '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
             '../../src/snapshot-empty.cc',
           ],
           'conditions': [
             ['want_separate_host_toolset==1', {
               'toolsets': ['host', 'target'],
               'dependencies': ['js2c#host'],
             }, {
               'toolsets': ['target'],
               'dependencies': ['js2c'],
             }],
             ['component=="shared_library"', {
               'defines': [
                 'BUILDING_V8_SHARED',
                 'V8_SHARED',
               ],
             }],
           ]
         },
         {
-          'target_name': 'v8_base',
+          'target_name': 'v8_base.<(v8_target_arch)',
           'type': 'static_library',
           'variables': {
             'optimize': 'max',
           },
           'include_dirs+': [
             '../../src',
           ],
           'sources': [
             '../../src/accessors.cc',
             '../../src/accessors.h',
@@ skipping 625 matching lines @@
                 'action': [
                   'python',
                   '../../tools/gen-postmortem-metadata.py',
                   '<@(_outputs)',
                   '<@(heapobject_files)'
                 ]
               }
            ]
         },
         {
-          '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',
           ],
           'sources': [
             '../../src/mksnapshot.cc',
           ],
           'conditions': [
             ['want_separate_host_toolset==1', {
               'toolsets': ['host'],
@@ skipping 171 matching lines @@
             }],
           ],
           'dependencies': [
             'v8'
           ],
         },
       ],
     }],
   ],
 }