From 883dc205bb6fdd503cab544c3a6eaf17c22ad2e4 Mon Sep 17 00:00:00 2001 From: Ayushman Chhabra Date: Sun, 2 Apr 2023 18:53:39 -0400 Subject: [PATCH] fix(build): use gyp variable for python --- patch/patches/icu.patch | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/patch/patches/icu.patch b/patch/patches/icu.patch index 99770bdf6a..05d5b7289c 100644 --- a/patch/patches/icu.patch +++ b/patch/patches/icu.patch @@ -1,8 +1,16 @@ diff --git a/icu.gyp b/icu.gyp -index b3c12030..799dce2a 100644 ---- icu.gyp -+++ icu.gyp -@@ -25,6 +25,7 @@ +index 7deb43c..e2ac65b 100644 +--- a/icu.gyp ++++ b/icu.gyp +@@ -10,6 +10,7 @@ + 'use_system_icu%': 0, + 'icu_use_data_file_flag%': 0, + 'want_separate_host_toolset%': 1, ++ 'python%': 'python3' + }, + 'target_defaults': { + 'direct_dependent_settings': { +@@ -25,6 +26,7 @@ 'defines': [ 'U_USING_ICU_NAMESPACE=0', 'HAVE_DLOPEN=0', @@ -10,7 +18,7 @@ index b3c12030..799dce2a 100644 # Only build encoding coverters and detectors necessary for HTML5. 'UCONFIG_ONLY_HTML_CONVERSION=1', # TODO(jshin): Do we still need/want this? -@@ -40,8 +41,18 @@ +@@ -40,8 +42,18 @@ ], }], ['OS=="win"', { @@ -29,3 +37,15 @@ index b3c12030..799dce2a 100644 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \ (target_arch=="arm" or target_arch=="ia32" or \ +@@ -171,9 +183,9 @@ + [ 'OS == "mac" or OS == "ios" or ' + '((OS == "android" or OS == "qnx") and ' + '_toolset == "host" and host_os == "mac")', { +- 'action': ['python', '<@(_inputs)', '<@(_outputs)', '--mac'], ++ 'action': ['<(python)', '<@(_inputs)', '<@(_outputs)', '--mac'], + } , { +- 'action': ['python', '<@(_inputs)', '<@(_outputs)'], ++ 'action': ['<(python)', '<@(_inputs)', '<@(_outputs)'], + }], + ], + },