tools,build: use the python interpreter running gyp througout the whole build process

configure.py

@@ -1523,40 +1523,6 @@ def configure_inspector(o):
                        options.without_ssl)
   o['variables']['v8_enable_inspector'] = 0 if disable_inspector else 1
 
-
-def make_bin_override():
-  if sys.platform == 'win32':
-    raise Exception('make_bin_override should not be called on win32.')
-  # If the system python is not the python we are running (which should be
-  # python 2), then create a directory with a symlink called `python` to our
-  # sys.executable. This directory will be prefixed to the PATH, so that
-  # other tools that shell out to `python` will use the appropriate python
-
-  which_python = which('python')
-  if (which_python and
-      os.path.realpath(which_python) == os.path.realpath(sys.executable)):
-    return
-
-  bin_override = os.path.abspath('out/tools/bin')
-  try:
-    os.makedirs(bin_override)
-  except OSError as e:
-    if e.errno != errno.EEXIST: raise e
-
-  python_link = os.path.join(bin_override, 'python')
-  try:
-    os.unlink(python_link)
-  except OSError as e:
-    if e.errno != errno.ENOENT: raise e
-  os.symlink(sys.executable, python_link)
-
-  # We need to set the environment right now so that when gyp (in run_gyp)
-  # shells out, it finds the right python (specifically at
-  # https://github.com/nodejs/node/blob/d82e107/deps/v8/gypfiles/toolchain.gypi#L43)
-  os.environ['PATH'] = bin_override + ':' + os.environ['PATH']
-
-  return bin_override
-
 output = {
   'variables': {},
   'include_dirs': [],
@@ -1638,14 +1604,11 @@ def make_bin_override():
 
 config = '\n'.join(['='.join(item) for item in config.items()]) + '\n'
 
-# On Windows there's no reason to search for a different python binary.
-bin_override = None if sys.platform == 'win32' else make_bin_override()
-if bin_override:
-  config = 'export PATH:=' + bin_override + ':$(PATH)\n' + config
+os.environ['PYTHON_EXECUTABLE'] = sys.executable
 
 write('config.mk', do_not_edit + config)
 
-gyp_args = ['--no-parallel', '-Dconfiguring_node=1']
+gyp_args = ['--no-parallel', '-Dconfiguring_node=1', "-DPYTHON_EXECUTABLE=%s" % sys.executable]
 
 if options.use_ninja:
   gyp_args += ['-f', 'ninja']

node.gyp

@@ -838,7 +838,7 @@
               'outputs': ['<(SHARED_INTERMEDIATE_DIR)/openssl.def'],
               'process_outputs_as_sources': 1,
               'action': [
-                'python',
+                '<(PYTHON_EXECUTABLE)',
                 'tools/mkssldef.py',
                 '<@(mkssldef_flags)',
                 '-o',
@@ -873,7 +873,7 @@
             }]
           ],
           'action': [
-            'python', 'tools/js2c.py',
+            '<(PYTHON_EXECUTABLE)', 'tools/js2c.py',
             '<@(_outputs)',
             '<@(_inputs)',
           ],

src/inspector/node_inspector.gypi

@@ -77,7 +77,7 @@
         '<(SHARED_INTERMEDIATE_DIR)/src/node_protocol.json',
       ],
       'action': [
-        'python',
+        '<(PYTHON_EXECUTABLE)',
         'tools/inspector_protocol/convert_protocol_to_json.py',
         '<@(_inputs)',
         '<@(_outputs)',
@@ -95,7 +95,7 @@
       ],
       'process_outputs_as_sources': 1,
       'action': [
-        'python',
+        '<(PYTHON_EXECUTABLE)',
         'tools/inspector_protocol/code_generator.py',
         '--jinja_dir', '<@(protocol_tool_path)',
         '--output_base', '<(SHARED_INTERMEDIATE_DIR)/src/',
@@ -113,7 +113,7 @@
         '<(SHARED_INTERMEDIATE_DIR)/concatenated_protocol.json',
       ],
       'action': [
-        'python',
+        '<(PYTHON_EXECUTABLE)',
         'tools/inspector_protocol/concatenate_protocols.py',
         '<@(_inputs)',
         '<@(_outputs)',
@@ -129,7 +129,7 @@
       ],
       'process_outputs_as_sources': 1,
       'action': [
-        'python',
+        '<(PYTHON_EXECUTABLE)',
         'tools/compress_json.py',
         '<@(_inputs)',
         '<@(_outputs)',

tools/gyp/gyp_main.py

@@ -10,6 +10,8 @@
 # Make sure we're using the version of pylib in this repo, not one installed
 # elsewhere on the system.
 sys.path.insert(0, os.path.join(os.path.dirname(sys.argv[0]), 'pylib'))
+sys.argv.append("-DPYTHON_EXECUTABLE=" + os.path.realpath(sys.executable))
+os.environ['PYTHON_EXECUTABLE'] = os.path.realpath(sys.executable)
 import gyp
 
 if __name__ == '__main__':

tools/gyp/pylib/gyp/generator/xcode.py

@@ -284,10 +284,10 @@ def Finalize1(self, xcode_targets, serialize_all_tests):
         command_prefix = ''
         if serialize_all_tests:
           command_prefix = \
-"""python -c "import fcntl, subprocess, sys
+"""%s -c "import fcntl, subprocess, sys
 file = open('$TMPDIR/GYP_serialize_test_runs', 'a')
 fcntl.flock(file.fileno(), fcntl.LOCK_EX)
-sys.exit(subprocess.call(sys.argv[1:]))" """
+sys.exit(subprocess.call(sys.argv[1:]))" """ % (sys.executable)
 
         # If we were unable to exec for some reason, we want to exit
         # with an error, and fixup variable references to be shell

tools/icu/icu-generic.gyp

@@ -240,7 +240,7 @@
                   'msvs_quote_cmd': 0,
                   'inputs': [ '<(icu_data_in)', 'icu_small.json' ],
                   'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/icutmp/icudt<(icu_ver_major)<(icu_endianness).dat' ],
-                  'action': [ 'python',
+                  'action': [ '<(PYTHON_EXECUTABLE)',
                               'icutrim.py',
                               '-P', '<(PRODUCT_DIR)/.', # '.' suffix is a workaround against GYP assumptions :(
                               '-D', '<(icu_data_in)',
@@ -322,7 +322,7 @@
                   'action_name': 'icutrim',
                   'inputs': [ '<(icu_data_in)', 'icu_small.json' ],
                   'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/icutmp/icudt<(icu_ver_major)<(icu_endianness).dat' ],
-                  'action': [ 'python',
+                  'action': [ '<(PYTHON_EXECUTABLE)',
                               'icutrim.py',
                               '-P', '<(PRODUCT_DIR)',
                               '-D', '<(icu_data_in)',

tools/v8_gypfiles/broken/shim_headers.gypi

@@ -62,7 +62,7 @@
       'outputs': [
         '<!@pymod_do_main(generate_shim_headers <@(generator_args) --outputs)',
       ],
-      'action': ['python',
+      'action': ['<(PYTHON_EXECUTABLE)',
                  '<(generator_path)',
                  '<@(generator_args)',
                  '--generate',

tools/v8_gypfiles/inspector.gypi

@@ -99,7 +99,7 @@
         '<@(inspector_generated_output_root)/src/js_protocol.stamp',
       ],
       'action': [
-        'python',
+        '<(PYTHON_EXECUTABLE)',
         '<(inspector_protocol_path)/check_protocol_compatibility.py',
         '--stamp', '<@(_outputs)',
         '<@(_inputs)',
@@ -118,7 +118,7 @@
       ],
       'process_outputs_as_sources': 1,
       'action': [
-        'python',
+        '<(PYTHON_EXECUTABLE)',
         '<(inspector_protocol_path)/code_generator.py',
         '--jinja_dir', '<(V8_ROOT)/third_party',
         '--output_base', '<(inspector_generated_output_root)/src/inspector',

tools/v8_gypfiles/toolchain.gypi

@@ -41,7 +41,7 @@
     'has_valgrind%': 0,
     'coverage%': 0,
     'v8_target_arch%': '<(target_arch)',
-    'v8_host_byteorder%': '<!(python -c "import sys; print(sys.byteorder)")',
+    'v8_host_byteorder%': '<!<(PYTHON_EXECUTABLE) -c "import sys; print sys.byteorder")',
     'force_dynamic_crt%': 0,
 
     # Setting 'v8_can_use_vfp32dregs' to 'true' will cause V8 to use the VFP

tools/v8_gypfiles/v8.gyp

@@ -190,7 +190,7 @@
             }],
           ],
           'action': [
-            'python', '<(V8_ROOT)/tools/testrunner/utils/dump_build_config_gyp.py',
+            '<(PYTHON_EXECUTABLE)', '<(V8_ROOT)/tools/testrunner/utils/dump_build_config_gyp.py',
             '<@(v8_dump_build_config_args)',
           ],
         },
@@ -2633,7 +2633,7 @@
             '<(SHARED_INTERMEDIATE_DIR)/debug-support.cc',
           ],
           'action': [
-            'python',
+            '<(PYTHON_EXECUTABLE)',
             '<(V8_ROOT)/tools/gen-postmortem-metadata.py',
             '<@(_outputs)',
             '<@(heapobject_files)'
@@ -2702,7 +2702,7 @@
             '<(generate_bytecode_builtins_list_output)',
           ],
           'action': [
-            'python',
+            '<(PYTHON_EXECUTABLE)',
             '<(V8_ROOT)/tools/run.py',
             '<@(_inputs)',
             '<@(_outputs)',

tools/v8_gypfiles/v8_external_snapshot.gypi

@@ -149,7 +149,7 @@
               ],
               'outputs': ['<(SHARED_INTERMEDIATE_DIR)/libraries-extras.bin'],
               'action': [
-                'python',
+                '<(PYTHON_EXECUTABLE)',
                 '<(V8_ROOT)/tools/js2c.py',
                 '<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc',
                 'EXTRAS',
@@ -172,14 +172,14 @@
                         '<(PRODUCT_DIR)/natives_blob_host.bin',
                       ],
                       'action': [
-                        'python', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob_host.bin'
+                        '<(PYTHON_EXECUTABLE)', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob_host.bin'
                       ],
                     }, {
                        'outputs': [
                          '<(PRODUCT_DIR)/natives_blob.bin',
                        ],
                        'action': [
-                         'python', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin'
+                         '<(PYTHON_EXECUTABLE)', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin'
                        ],
                      }],
                   ],
@@ -188,7 +188,7 @@
                      '<(PRODUCT_DIR)/natives_blob.bin',
                    ],
                    'action': [
-                     'python', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin'
+                     '<(PYTHON_EXECUTABLE)', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin'
                    ],
                  }],
               ],