summaryrefslogtreecommitdiff
path: root/solenv/inc/set_wntx64.mk
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-05-15 19:18:39 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-05-15 20:02:10 +0300
commitaf495ab5189641b718eea78b1b4949df2053e220 (patch)
treec903692b32ce57a11d3862ddfb83446c9e9854c7 /solenv/inc/set_wntx64.mk
parent0e69a0b50e8b773368a3bcbb849c5dbc0084d358 (diff)
For some reason have to use doublequotes around CXX_X64 etc
I don't understand why, but need to use double-quotes around the CXX_X64 etc values assigned in set_wnt64.mk, to guard against their pathname containing spaces or other special characters, like parens in the case of "/cygdrive/c/Program Files (x64)". I hope this helps those who have MSVC installed in its default path. Also drop use of the unnecessary WRAPCMD.
Diffstat (limited to 'solenv/inc/set_wntx64.mk')
-rw-r--r--solenv/inc/set_wntx64.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk
index bf30d63c2731..971dd650b61d 100644
--- a/solenv/inc/set_wntx64.mk
+++ b/solenv/inc/set_wntx64.mk
@@ -35,11 +35,11 @@
.IF "$(BUILD_X64)"!=""
# ----------------- settings for x64 --------------------
-CC_X64*:=$(WRAPCMD) $(CXX_X64_BINARY)
-CXX_X64*:=$(WRAPCMD) $(CXX_X64_BINARY)
-LINK_X64*:=$(WRAPCMD) $(LINK_X64_BINARY) $(NOLOGO) -MACHINE:X64
-LIBMGR_X64=$(WRAPCMD) $(LIBMGR_X64_BINARY) $(NOLOGO)
-IMPLIB_X64=$(WRAPCMD) $(LIBMGR_X64_BINARY)
+CC_X64*:="$(CXX_X64_BINARY)"
+CXX_X64*:="$(CXX_X64_BINARY)"
+LINK_X64*:="$(LINK_X64_BINARY)" $(NOLOGO) -MACHINE:X64
+LIBMGR_X64="$(LIBMGR_X64_BINARY)" $(NOLOGO)
+IMPLIB_X64="$(LIBMGR_X64_BINARY)"
USE_CFLAGS_X64=-c -nologo -Gs $(NOLOGO) -Zm500 -Zc:forScope,wchar_t- -GR