make/windows/makefiles/defs.make

*** 200,204 ****
--- 200,220 ----
    EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.map
    EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
    # 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 -m -a $(CXX)))"
+     MAKE_ARGS += LD="$(subst /,\\,$(shell /bin/cygpath -m -a $(LD)))"
+     MAKE_ARGS += RC="$(subst /,\\,$(shell /bin/cygpath -m -a $(RC)))"
+     MAKE_ARGS += MT="$(subst /,\\,$(shell /bin/cygpath -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