Skip to content

Commit c49e9dc

Browse files
committed
use shell rather than cmd for cscript invocation
1 parent eb88e7d commit c49e9dc

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/tbb/build/windows.inc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ endif
4949

5050
# A convenience wrapper for calls to detect.js.
5151
# $(1) is the full command line for the script, e.g. /minversion icl 12
52-
detect_js = $(shell $(CMD) "cscript /nologo /E:jscript $(tbb_root)/build/detect.js $(1)")
52+
detect_js = $(shell $(CMD) "cscript //NoLogo //E:jscript $(tbb_root)/build/detect.js $(1)")
5353

5454
# TODO give an error if archs doesn't match
5555
ifndef arch
@@ -120,8 +120,8 @@ ifneq ($(filter vc8 vc9,$(runtime)),)
120120
RML.MANIFEST = tbbmanifest.exe.manifest
121121
endif
122122

123-
MAKE_VERSIONS = $(CMD) "cscript /nologo /E:jscript $(subst \,/,$(tbb_root))/build/version_info_windows.js $(CONLY) $(arch) $(subst \,/,$(VERSION_FLAGS))" > version_string.ver
124-
MAKE_TBBVARS = $(CMD) "$(subst /,\,$(tbb_root))\build\generate_tbbvars.bat"
123+
MAKE_VERSIONS = $(shell cscript "//NoLogo" "//E:jscript" "$(subst \,/,$(tbb_root)/build/version_info_windows.js)" "$(subst \,/,$(CONLY))" "$(arch)" "$(subst \,/,$(VERSION_FLAGS))" > version_string.ver)
124+
MAKE_TBBVARS = $(CMD) "$(subst /,\,$(tbb_root)/build/generate_tbbvars.bat)"
125125

126126
TEST_LAUNCHER = $(subst /,\,$(tbb_root))\build\test_launcher.bat $(largs)
127127

0 commit comments

Comments
 (0)