Mercurial > hg > graal-compiler
comparison make/windows/makefiles/defs.make @ 5897:7292cff45988
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 |
comparison
equal
deleted
inserted
replaced
5896:b5ab7482dbf9 | 5897:7292cff45988 |
---|---|
200 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.map | 200 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.map |
201 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar | 201 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar |
202 # Must pass this down to nmake. | 202 # Must pass this down to nmake. |
203 MAKE_ARGS += BUILD_WIN_SA=1 | 203 MAKE_ARGS += BUILD_WIN_SA=1 |
204 endif | 204 endif |
205 | |
206 # Propagate compiler and tools paths from configure to nmake. | |
207 # Need to make sure they contain \\ and not /. | |
208 ifneq ($(SPEC),) | |
209 ifeq ($(USING_CYGWIN), true) | |
210 MAKE_ARGS += CXX="$(subst /,\\,$(shell /bin/cygpath -s -m -a $(CXX)))" | |
211 MAKE_ARGS += LD="$(subst /,\\,$(shell /bin/cygpath -s -m -a $(LD)))" | |
212 MAKE_ARGS += RC="$(subst /,\\,$(shell /bin/cygpath -s -m -a $(RC)))" | |
213 MAKE_ARGS += MT="$(subst /,\\,$(shell /bin/cygpath -s -m -a $(MT)))" | |
214 else | |
215 MAKE_ARGS += CXX="$(subst /,\\,$(CXX))" | |
216 MAKE_ARGS += LD="$(subst /,\\,$(LD))" | |
217 MAKE_ARGS += RC="$(subst /,\\,$(RC))" | |
218 MAKE_ARGS += MT="$(subst /,\\,$(MT))" | |
219 endif | |
220 endif |