summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorRichard Lau <rlau@redhat.com>2020-11-07 02:45:00 +0000
committerNode.js GitHub Bot <github-bot@iojs.org>2020-11-10 12:26:46 +0000
commit322abb4e051f71448ecc52e7351e84022a58aab7 (patch)
tree0a7be9f7879a8c59b57f5c0c5be5f3960667c6f7 /tools
parentdd0f8f18c253e4cbd4f8e0121dd68b033168524e (diff)
downloadios-node-v8-322abb4e051f71448ecc52e7351e84022a58aab7.tar.gz
ios-node-v8-322abb4e051f71448ecc52e7351e84022a58aab7.tar.bz2
ios-node-v8-322abb4e051f71448ecc52e7351e84022a58aab7.zip
build, tools: look for local installation of NASM
Search the default installation path for NASM installed by a user without administrator privileges when not found on the Path or in the default system-wide installation path. PR-URL: https://github.com/nodejs/node/pull/36014 Reviewed-By: Zeyu Yang <himself65@outlook.com> Reviewed-By: Michael Dawson <midawson@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/msvs/find_nasm.cmd5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/msvs/find_nasm.cmd b/tools/msvs/find_nasm.cmd
index d30d213116..09e7c7554a 100644
--- a/tools/msvs/find_nasm.cmd
+++ b/tools/msvs/find_nasm.cmd
@@ -16,4 +16,9 @@ IF EXIST "%ProgramFiles(x86)%\NASM\nasm.exe" (
EXIT /B 0
)
+if EXIST "%LOCALAPPDATA%\bin\NASM\nasm.exe" (
+ SET "Path=%Path%;%LOCALAPPDATA%\bin\NASM"
+ EXIT /B 0
+)
+
EXIT /B 1