Mercurial > hg > graal-compiler

diff make/windows/makefiles/defs.make @ 5897:7292cff45988

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7141244: build-infra merge: Include $(SPEC) in makefiles and make variables overridable Reviewed-by: dholmes, ohrstrom, ohair, jcoomes
author erikj
date Wed, 22 Feb 2012 09:24:35 +0100
parents f08d439fab8c
children 22d276ade3e1
line wrap: on
line diff
--- a/make/windows/makefiles/defs.make	Wed Feb 22 10:32:29 2012 -0800
+++ b/make/windows/makefiles/defs.make	Wed Feb 22 09:24:35 2012 +0100
@@ -202,3 +202,19 @@
   # Must pass this down to nmake.
   MAKE_ARGS += BUILD_WIN_SA=1
 endif
+
+# Propagate compiler and tools paths from configure to nmake. 
+# Need to make sure they contain \\ and not /.
+ifneq ($(SPEC),)
+  ifeq ($(USING_CYGWIN), true)
+    MAKE_ARGS += CXX="$(subst /,\\,$(shell /bin/cygpath -s -m -a $(CXX)))"
+    MAKE_ARGS += LD="$(subst /,\\,$(shell /bin/cygpath -s -m -a $(LD)))"
+    MAKE_ARGS += RC="$(subst /,\\,$(shell /bin/cygpath -s -m -a $(RC)))"
+    MAKE_ARGS += MT="$(subst /,\\,$(shell /bin/cygpath -s -m -a $(MT)))"
+  else
+    MAKE_ARGS += CXX="$(subst /,\\,$(CXX))"
+    MAKE_ARGS += LD="$(subst /,\\,$(LD))"
+    MAKE_ARGS += RC="$(subst /,\\,$(RC))"
+    MAKE_ARGS += MT="$(subst /,\\,$(MT))"
+  endif
+endif