Skip to content

Commit

Permalink
win,build: forward release_urlbase to configure
Browse files Browse the repository at this point in the history
The RELEASE_URLBASE environment variable is used in releases as
a prefix for links in the process.release object. The Makefile picks
it and forwards it to configure, but vcbuild.bat did not. Hence, in
Windows, Node releases have a correct process.release because it uses
the default URL, but nightlies, RCs and so on do not, breaking
node-gyp. This enables native modules to be built with such versions
of Node.

PR-URL: #8430
Reviewed-By: jbergstroem - Johan Bergström <bugs@bergstroem.nu>
  • Loading branch information
joaocgreis authored and Fishrock123 committed Sep 14, 2016
1 parent 408308f commit f346dee
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions vcbuild.bat
Expand Up @@ -33,7 +33,6 @@ set noperfctr=
set noperfctr_msi_arg= set noperfctr_msi_arg=
set i18n_arg= set i18n_arg=
set download_arg= set download_arg=
set release_urls_arg=
set build_release= set build_release=
set enable_vtune_arg= set enable_vtune_arg=
set configure_flags= set configure_flags=
Expand Down Expand Up @@ -108,7 +107,7 @@ if "%config%"=="Debug" set configure_flags=%configure_flags% --debug
if defined nosnapshot set configure_flags=%configure_flags% --without-snapshot if defined nosnapshot set configure_flags=%configure_flags% --without-snapshot
if defined noetw set configure_flags=%configure_flags% --without-etw& set noetw_msi_arg=/p:NoETW=1 if defined noetw set configure_flags=%configure_flags% --without-etw& set noetw_msi_arg=/p:NoETW=1
if defined noperfctr set configure_flags=%configure_flags% --without-perfctr& set noperfctr_msi_arg=/p:NoPerfCtr=1 if defined noperfctr set configure_flags=%configure_flags% --without-perfctr& set noperfctr_msi_arg=/p:NoPerfCtr=1
if defined release_urlbase set release_urlbase_arg=--release-urlbase=%release_urlbase% if defined release_urlbase set configure_flags=%configure_flags% --release-urlbase=%release_urlbase%
if defined download_arg set configure_flags=%configure_flags% %download_arg% if defined download_arg set configure_flags=%configure_flags% %download_arg%
if defined enable_vtune_arg set configure_flags=%configure_flags% --enable-vtune-profiling if defined enable_vtune_arg set configure_flags=%configure_flags% --enable-vtune-profiling
if defined dll set configure_flags=%configure_flags% --shared if defined dll set configure_flags=%configure_flags% --shared
Expand Down

0 comments on commit f346dee

Please sign in to comment.