common/autoconf/hotspot-spec.gmk.in

changeset 494
e64f2cb57d05
parent 478
2ba6f4da4bf3
child 512
582c696033f5
equal deleted inserted replaced
488:8a3fe0ae06a8 494:e64f2cb57d05
46 46
47 ALT_CUPS_HEADERS_PATH:=$(patsubst -I%,%,$(filter -I%,@CUPS_CFLAGS@)) 47 ALT_CUPS_HEADERS_PATH:=$(patsubst -I%,%,$(filter -I%,@CUPS_CFLAGS@))
48 48
49 # The HOSTCC/HOSTCXX is Hotspot terminology for the BUILD_CC/BUILD_CXX, i.e. the 49 # The HOSTCC/HOSTCXX is Hotspot terminology for the BUILD_CC/BUILD_CXX, i.e. the
50 # compiler that produces code that can be run on the build platform. 50 # compiler that produces code that can be run on the build platform.
51 HOSTCC:=@UNCYGDRIVE@ @BUILD_CC@ 51 HOSTCC:=@FIXPATH@ @BUILD_CC@
52 HOSTCXX:=@UNCYGDRIVE@ @BUILD_CXX@ 52 HOSTCXX:=@FIXPATH@ @BUILD_CXX@
53 53
54 #################################################### 54 ####################################################
55 # 55 #
56 # Legacy Hotspot support 56 # Legacy Hotspot support
57 57
76 @LP64@ 76 @LP64@
77 77
78 ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR) 78 ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
79 ALT_EXPORT_PATH=$(HOTSPOT_DIST) 79 ALT_EXPORT_PATH=$(HOTSPOT_DIST)
80 80
81 HOTSPOT_MAKE_ARGS:=@HOTSPOT_MAKE_ARGS@ 81 HOTSPOT_MAKE_ARGS:=@HOTSPOT_MAKE_ARGS@ @STATIC_CXX_SETTING@
82 # This is used from the libjvm build for C/C++ code. 82 # This is used from the libjvm build for C/C++ code.
83 HOTSPOT_BUILD_JOBS:=@CONCURRENT_BUILD_JOBS@ 83 HOTSPOT_BUILD_JOBS:=@CONCURRENT_BUILD_JOBS@
84 # Control wether Hotspot runs Queens test after building 84 # Control wether Hotspot runs Queens test after building
85 TEST_IN_BUILD=@TEST_IN_BUILD@ 85 TEST_IN_BUILD=@TEST_IN_BUILD@
86 86
87 # For hotspot, override compiler/tools definition to not include FIXPATH prefix.
88 # Hotspot has its own handling on the Windows path situation.
89 CXX:=@CCACHE@ @HOTSPOT_CXX@
90 LD:=@HOTSPOT_LD@
91 MT:=@HOTSPOT_MT@
92 RC:=@HOTSPOT_RC@
87 93
88 EXTRA_CFLAGS=@LEGACY_EXTRA_CFLAGS@ 94 EXTRA_CFLAGS=@LEGACY_EXTRA_CFLAGS@
89 EXTRA_CXXFLAGS=@LEGACY_EXTRA_CXXFLAGS@ 95 EXTRA_CXXFLAGS=@LEGACY_EXTRA_CXXFLAGS@
90 EXTRA_LDFLAGS=@LEGACY_EXTRA_LDFLAGS@ 96 EXTRA_LDFLAGS=@LEGACY_EXTRA_LDFLAGS@
97
98 # Sneak this in via the spec.gmk file, since we don't want to mess around too much with the Hotspot make files.
99 # This is needed to get the LOG setting to work properly.
100 include $(SRC_ROOT)/common/makefiles/MakeBase.gmk

mercurial