Skip to content
This repository was archived by the owner on Oct 15, 2020. It is now read-only.

Commit efeaf88

Browse files
committed
build: enable cross-compilation in vcbuild.bat
1 parent 64480a5 commit efeaf88

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

vcbuild.bat

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ if defined build_release (
106106
)
107107

108108
:: assign path to node_exe
109-
set "node_exe=%config%\node.exe"
109+
set "node_exe=%~dp0%config%\node.exe"
110+
if not defined native_node_exe set "native_node_exe=%node_exe%"
110111

111112
if "%config%"=="Debug" set configure_flags=%configure_flags% --debug
112113
if defined nosnapshot set configure_flags=%configure_flags% --without-snapshot
@@ -204,7 +205,7 @@ if errorlevel 1 echo Failed to sign exe&goto exit
204205
@rem Skip license.rtf generation if not requested.
205206
if not defined licensertf goto package
206207

207-
%config%\node tools\license2rtf.js < LICENSE > %config%\license.rtf
208+
%native_node_exe% tools\license2rtf.js < LICENSE > %config%\license.rtf
208209
if errorlevel 1 echo Failed to generate license.rtf&goto exit
209210

210211
:package
@@ -250,10 +251,10 @@ if errorlevel 1 echo Cannot copy node.lib && goto package_error
250251
copy /Y chakracore.lib node-v%FULLVERSION%-win-%target_arch%\sdk\%config%\ > nul
251252
if errorlevel 1 echo Cannot copy chakracore.lib && goto package_error
252253
set "pkgnpmsh=node-v%FULLVERSION%-win-%target_arch%/npm"
253-
node.exe -e "var data=fs.readFileSync('%pkgnpmsh%', 'utf8').split('\n');data.splice(-2, 0, 'export NPM_CONFIG_NODEDIR=\"$basedir/sdk\"');fs.writeFileSync('%pkgnpmsh%', data.join('\n'))"
254+
%native_node_exe% -e "var data=fs.readFileSync('%pkgnpmsh%', 'utf8').split('\n');data.splice(-2, 0, 'export NPM_CONFIG_NODEDIR=\"$basedir/sdk\"');fs.writeFileSync('%pkgnpmsh%', data.join('\n'))"
254255
if errorlevel 1 echo Cannot change %pkgnpmsh% && goto package_error
255256
set "pkgnpmcmd=node-v%FULLVERSION%-win-%target_arch%/npm.cmd"
256-
node.exe -e "var data=fs.readFileSync('%pkgnpmcmd%', 'utf8').split('\n');data.splice(-2, 0, 'SET \"NPM_CONFIG_NODEDIR=%%~dp0\\sdk\"');fs.writeFileSync('%pkgnpmcmd%', data.join('\n'))"
257+
%native_node_exe% -e "var data=fs.readFileSync('%pkgnpmcmd%', 'utf8').split('\n');data.splice(-2, 0, 'SET \"NPM_CONFIG_NODEDIR=%%~dp0\\sdk\"');fs.writeFileSync('%pkgnpmcmd%', data.join('\n'))"
257258
if errorlevel 1 echo Cannot change %pkgnpmcmd% && goto package_error
258259

259260
echo Creating node-v%FULLVERSION%-win-%target_arch%.7z

0 commit comments

Comments
 (0)