1.1 --- a/common/autoconf/hotspot-spec.gmk.in Wed Oct 24 13:11:42 2012 -0700
1.2 +++ b/common/autoconf/hotspot-spec.gmk.in Fri Oct 26 14:29:57 2012 -0700
1.3 @@ -48,8 +48,8 @@
1.4
1.5 # The HOSTCC/HOSTCXX is Hotspot terminology for the BUILD_CC/BUILD_CXX, i.e. the
1.6 # compiler that produces code that can be run on the build platform.
1.7 -HOSTCC:=@UNCYGDRIVE@ @BUILD_CC@
1.8 -HOSTCXX:=@UNCYGDRIVE@ @BUILD_CXX@
1.9 +HOSTCC:=@FIXPATH@ @BUILD_CC@
1.10 +HOSTCXX:=@FIXPATH@ @BUILD_CXX@
1.11
1.12 ####################################################
1.13 #
1.14 @@ -78,13 +78,23 @@
1.15 ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
1.16 ALT_EXPORT_PATH=$(HOTSPOT_DIST)
1.17
1.18 -HOTSPOT_MAKE_ARGS:=@HOTSPOT_MAKE_ARGS@
1.19 +HOTSPOT_MAKE_ARGS:=@HOTSPOT_MAKE_ARGS@ @STATIC_CXX_SETTING@
1.20 # This is used from the libjvm build for C/C++ code.
1.21 HOTSPOT_BUILD_JOBS:=@CONCURRENT_BUILD_JOBS@
1.22 # Control wether Hotspot runs Queens test after building
1.23 TEST_IN_BUILD=@TEST_IN_BUILD@
1.24
1.25 +# For hotspot, override compiler/tools definition to not include FIXPATH prefix.
1.26 +# Hotspot has its own handling on the Windows path situation.
1.27 +CXX:=@CCACHE@ @HOTSPOT_CXX@
1.28 +LD:=@HOTSPOT_LD@
1.29 +MT:=@HOTSPOT_MT@
1.30 +RC:=@HOTSPOT_RC@
1.31
1.32 EXTRA_CFLAGS=@LEGACY_EXTRA_CFLAGS@
1.33 EXTRA_CXXFLAGS=@LEGACY_EXTRA_CXXFLAGS@
1.34 EXTRA_LDFLAGS=@LEGACY_EXTRA_LDFLAGS@
1.35 +
1.36 +# Sneak this in via the spec.gmk file, since we don't want to mess around too much with the Hotspot make files.
1.37 +# This is needed to get the LOG setting to work properly.
1.38 +include $(SRC_ROOT)/common/makefiles/MakeBase.gmk
