gyp: record absolute Python path in Makefile

DeeDeeG · DeeDeeG · commit a68d184c75fa · 2021-03-31T17:21:27.000-04:00
Ensures the Python validated by `lib/find-python.js` is used
when running `gyp-mac-tool` during package builds.

(Unless that Python binary has been moved/deleted since
`node-gyp configure` was run, but we an't do much about that.)
diff --git a/gyp/pylib/gyp/generator/make.py b/gyp/pylib/gyp/generator/make.py
@@ -25,6 +25,7 @@
 import os
 import re
 import subprocess
+import sys
 import gyp
 import gyp.common
 import gyp.xcode_emulation
@@ -177,9 +178,9 @@ def CalculateGeneratorInputInfo(params):
 cmd_solink_module = $(LINK.$(TOOLSET)) -o $@ -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,-soname=$(@F) -Wl,--start-group $(filter-out FORCE_DO_CMD, $^) -Wl,--end-group $(LIBS)
 """  # noqa: E501
 
-LINK_COMMANDS_MAC = """\
+LINK_COMMANDS_MAC = f"""\
 quiet_cmd_alink = LIBTOOL-STATIC $@
-cmd_alink = rm -f $@ && ./gyp-mac-tool filter-libtool libtool $(GYP_LIBTOOLFLAGS) -static -o $@ $(filter %.o,$^)
+cmd_alink = rm -f $@ && $(shell command -v {sys.executable}) ./gyp-mac-tool filter-libtool libtool $(GYP_LIBTOOLFLAGS) -static -o $@ $(filter %.o,$^)
 
 quiet_cmd_link = LINK($(TOOLSET)) $@
 cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o "$@" $(LD_INPUTS) $(LIBS)
@@ -503,7 +504,7 @@ def CalculateGeneratorInputInfo(params):
 """  # noqa: E501
 )
 
-SHARED_HEADER_MAC_COMMANDS = """
+SHARED_HEADER_MAC_COMMANDS = f"""
 quiet_cmd_objc = CXX($(TOOLSET)) $@
 cmd_objc = $(CC.$(TOOLSET)) $(GYP_OBJCFLAGS) $(DEPFLAGS) -c -o $@ $<
 
@@ -524,10 +525,10 @@ def CalculateGeneratorInputInfo(params):
 # Use $(4) for the command, since $(2) and $(3) are used as flag by do_cmd
 # already.
 quiet_cmd_mac_tool = MACTOOL $(4) $<
-cmd_mac_tool = ./gyp-mac-tool $(4) $< "$@"
+cmd_mac_tool = $(shell command -v {sys.executable}) ./gyp-mac-tool $(4) $< "$@"
 
 quiet_cmd_mac_package_framework = PACKAGE FRAMEWORK $@
-cmd_mac_package_framework = ./gyp-mac-tool package-framework "$@" $(4)
+cmd_mac_package_framework = $(shell command -v {sys.executable}) ./gyp-mac-tool package-framework "$@" $(4)
 
 quiet_cmd_infoplist = INFOPLIST $@
 cmd_infoplist = $(CC.$(TOOLSET)) -E -P -Wno-trigraphs -x c $(INFOPLIST_DEFINES) "$<" -o "$@"
@@ -2301,7 +2302,7 @@ def CalculateMakefilePath(build_file, base_name):
         "LINK.host": GetEnvironFallback(("LINK_host", "LINK"), "$(CXX.host)"),
     }
     if flavor == "mac":
-        flock_command = "./gyp-mac-tool flock"
+        flock_command = f"$(shell command -v {sys.executable}) ./gyp-mac-tool flock"
         header_params.update(
             {
                 "flock": flock_command,
@@ -2331,7 +2332,7 @@ def CalculateMakefilePath(build_file, base_name):
         header_params.update(
             {
                 "copy_archive_args": copy_archive_arguments,
-                "flock": "./gyp-flock-tool flock",
+                "flock": f"$(shell command -v {sys.executable}) ./gyp-flock-tool flock",
                 "flock_index": 2,
             }
         )
@@ -2347,7 +2348,7 @@ def CalculateMakefilePath(build_file, base_name):
             {
                 "copy_archive_args": copy_archive_arguments,
                 "link_commands": LINK_COMMANDS_AIX,
-                "flock": "./gyp-flock-tool flock",
+                "flock": f"$(shell command -v {sys.executable}) ./gyp-flock-tool flock",
                 "flock_index": 2,
             }
         )
