1.1 --- a/make/linux/makefiles/vm.make Tue Jan 31 13:12:39 2012 +0100
1.2 +++ b/make/linux/makefiles/vm.make Mon Feb 06 09:14:22 2012 +0100
1.3 @@ -88,7 +88,7 @@
1.4 BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\""
1.5 VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\""
1.6
1.7 -CPPFLAGS = \
1.8 +CXXFLAGS = \
1.9 ${SYSDEFS} \
1.10 ${INCLUDES} \
1.11 ${BUILD_VERSION} \
1.12 @@ -100,7 +100,7 @@
1.13 # This is VERY important! The version define must only be supplied to vm_version.o
1.14 # If not, ccache will not re-use the cache at all, since the version string might contain
1.15 # a time and date.
1.16 -vm_version.o: CPPFLAGS += ${JRE_VERSION}
1.17 +vm_version.o: CXXFLAGS += ${JRE_VERSION}
1.18
1.19 ifndef JAVASE_EMBEDDED
1.20 CFLAGS += -DINCLUDE_TRACE
1.21 @@ -276,13 +276,13 @@
1.22 LIBS_VM += $(LLVM_LIBS)
1.23 endif
1.24
1.25 -LINK_VM = $(LINK_LIB.c)
1.26 +LINK_VM = $(LINK_LIB.CC)
1.27
1.28 # rule for building precompiled header
1.29 $(PRECOMPILED_HEADER):
1.30 $(QUIETLY) echo Generating precompiled header $@
1.31 $(QUIETLY) mkdir -p $(PRECOMPILED_HEADER_DIR)
1.32 - $(QUIETLY) $(COMPILE.CC) $(DEPFLAGS) -x c++-header $(PRECOMPILED_HEADER_SRC) -o $@ $(COMPILE_DONE)
1.33 + $(QUIETLY) $(COMPILE.CXX) $(DEPFLAGS) -x c++-header $(PRECOMPILED_HEADER_SRC) -o $@ $(COMPILE_DONE)
1.34
1.35 # making the library:
1.36
1.37 @@ -312,10 +312,10 @@
1.38 $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT)
1.39 $(QUIETLY) { \
1.40 echo Linking vm...; \
1.41 - $(LINK_LIB.CC/PRE_HOOK) \
1.42 + $(LINK_LIB.CXX/PRE_HOOK) \
1.43 $(LINK_VM) $(LD_SCRIPT_FLAG) \
1.44 $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \
1.45 - $(LINK_LIB.CC/POST_HOOK) \
1.46 + $(LINK_LIB.CXX/POST_HOOK) \
1.47 rm -f $@.1; ln -s $@ $@.1; \
1.48 [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \
1.49 if [ \"$(CROSS_COMPILE_ARCH)\" = \"\" ] ; then \
