Skip to content

Commit c5e22d2

Browse files
committed
fix cscript invocation
1 parent f6b4f74 commit c5e22d2

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

src/Makevars.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ ifeq ($(OS), Windows_NT)
1010
MAKE = make
1111
MAKEFLAGS = -e -s -j1
1212
MAKE_CMD = \
13+
MSYS2_ARG_CONV_EXCL="*" \
1314
CYGWIN=nodosfilewarning \
1415
CONLY="@WINDOWS_CC@" \
1516
CPLUS="@WINDOWS_CXX11@" \

src/tbb/build/windows.inc

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,14 @@ ifneq ($(filter vc8 vc9,$(runtime)),)
120120
RML.MANIFEST = tbbmanifest.exe.manifest
121121
endif
122122

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)"
123+
MAKE_VERSIONS = $(CMD) cscript //NoLogo //E:JScript \
124+
"$(subst \,/,$(tbb_root)/build/version_info_windows.js)" \
125+
"$(subst \,/,$(CONLY))" \
126+
"$(arch)" \
127+
"$(subst \,/,$(VERSION_FLAGS))" \
128+
> version_string.ver
129+
130+
MAKE_TBBVARS = $(CMD) "$(subst /,\,$(tbb_root)/build/generate_tbbvars.bat)"
125131

126132
TEST_LAUNCHER = $(subst /,\,$(tbb_root))\build\test_launcher.bat $(largs)
127133

tools/config.R

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -266,10 +266,6 @@ read_r_config <- function(
266266
stop(sprintf(fmt, getRversion()))
267267
}
268268

269-
# notify user
270-
if (verbose)
271-
message("*** executing 'R CMD config --all'")
272-
273269
# execute action
274270
stdout <- tempfile("r-cmd-config-", fileext = ".txt")
275271
on.exit(unlink(stdout), add = TRUE)
@@ -283,10 +279,6 @@ read_r_config <- function(
283279

284280
} else {
285281

286-
# notify user
287-
if (verbose)
288-
message("*** executing 'R CMD config'")
289-
290282
# loop through requested values and call R CMD config
291283
config <- lapply(values, function(value) {
292284

0 commit comments

Comments
 (0)