equal
deleted
inserted
replaced
17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
18 # |
18 # |
19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
20 # or visit www.oracle.com if you need additional information or have any |
20 # or visit www.oracle.com if you need additional information or have any |
21 # questions. |
21 # questions. |
22 # |
22 # |
23 # |
23 # |
24 |
24 |
25 # The common definitions for hotspot windows builds. |
25 # The common definitions for hotspot windows builds. |
26 # Include the top level defs.make under make directory instead of this one. |
26 # Include the top level defs.make under make directory instead of this one. |
27 # This file is included into make/defs.make. |
27 # This file is included into make/defs.make. |
207 endif |
207 endif |
208 # Check for MinGW |
208 # Check for MinGW |
209 ifneq (,$(findstring MINGW,$(SYSTEM_UNAME))) |
209 ifneq (,$(findstring MINGW,$(SYSTEM_UNAME))) |
210 USING_MINGW=true |
210 USING_MINGW=true |
211 endif |
211 endif |
212 # FIXUP: The subdirectory for a debug build is NOT the same on all platforms |
|
213 VM_DEBUG=debug |
|
214 |
212 |
215 # Windows wants particular paths due to nmake (must be after macros defined) |
213 # Windows wants particular paths due to nmake (must be after macros defined) |
216 # It is important that gnumake invokes nmake with C:\\...\\ formated |
214 # It is important that gnumake invokes nmake with C:\\...\\ formated |
217 # strings so that nmake gets C:\...\ style strings. |
215 # strings so that nmake gets C:\...\ style strings. |
218 # Check for CYGWIN |
216 # Check for CYGWIN |
290 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar |
288 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar |
291 # Must pass this down to nmake. |
289 # Must pass this down to nmake. |
292 MAKE_ARGS += BUILD_WIN_SA=1 |
290 MAKE_ARGS += BUILD_WIN_SA=1 |
293 endif |
291 endif |
294 |
292 |
295 # Propagate compiler and tools paths from configure to nmake. |
293 # Propagate compiler and tools paths from configure to nmake. |
296 # Need to make sure they contain \\ and not /. |
294 # Need to make sure they contain \\ and not /. |
297 ifneq ($(SPEC),) |
295 ifneq ($(SPEC),) |
298 ifeq ($(USING_CYGWIN), true) |
296 ifeq ($(USING_CYGWIN), true) |
299 MAKE_ARGS += CXX="$(subst /,\\,$(shell /bin/cygpath -s -m -a $(CXX)))" |
297 MAKE_ARGS += CXX="$(subst /,\\,$(shell /bin/cygpath -s -m -a $(CXX)))" |
300 MAKE_ARGS += LD="$(subst /,\\,$(shell /bin/cygpath -s -m -a $(LD)))" |
298 MAKE_ARGS += LD="$(subst /,\\,$(shell /bin/cygpath -s -m -a $(LD)))" |