make/linux/makefiles/vm.make

@@ -86,11 +86,11 @@
 HS_LIB_ARCH   = -DHOTSPOT_LIB_ARCH=\"$(LIBARCH)\"
 BUILD_TARGET  = -DHOTSPOT_BUILD_TARGET="\"$(TARGET)\""
 BUILD_USER    = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\""
 VM_DISTRO     = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\""
 
-CPPFLAGS =           \
+CXXFLAGS =           \
   ${SYSDEFS}         \
   ${INCLUDES}        \
   ${BUILD_VERSION}   \
   ${BUILD_TARGET}    \
   ${BUILD_USER}      \

@@ -98,11 +98,11 @@
   ${VM_DISTRO}
 
 # This is VERY important! The version define must only be supplied to vm_version.o
 # If not, ccache will not re-use the cache at all, since the version string might contain
 # a time and date. 
-vm_version.o: CPPFLAGS += ${JRE_VERSION}
+vm_version.o: CXXFLAGS += ${JRE_VERSION}
 
 ifndef JAVASE_EMBEDDED
 CFLAGS += -DINCLUDE_TRACE
 endif
 

@@ -274,17 +274,17 @@
 ifeq ($(SHARK_BUILD), true)
   LFLAGS_VM += $(LLVM_LDFLAGS)
   LIBS_VM   += $(LLVM_LIBS)
 endif
 
-LINK_VM = $(LINK_LIB.c)
+LINK_VM = $(LINK_LIB.CC)
 
 # rule for building precompiled header
 $(PRECOMPILED_HEADER):
         $(QUIETLY) echo Generating precompiled header $@
         $(QUIETLY) mkdir -p $(PRECOMPILED_HEADER_DIR)
-        $(QUIETLY) $(COMPILE.CC) $(DEPFLAGS) -x c++-header $(PRECOMPILED_HEADER_SRC) -o $@ $(COMPILE_DONE)
+        $(QUIETLY) $(COMPILE.CXX) $(DEPFLAGS) -x c++-header $(PRECOMPILED_HEADER_SRC) -o $@ $(COMPILE_DONE)
 
 # making the library:
 
 ifneq ($(JVM_BASE_ADDR),)
 # By default shared library is linked at base address == 0. Modify the

@@ -310,14 +310,14 @@
 # DSO. To workaround that, we run chcon to libjvm.so after it is built. See 
 # details in bug 6538311.
 $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT)
         $(QUIETLY) {                                                    \
             echo Linking vm...;                                         \
-            $(LINK_LIB.CC/PRE_HOOK)                                     \
+            $(LINK_LIB.CXX/PRE_HOOK)                                     \
             $(LINK_VM) $(LD_SCRIPT_FLAG)                                \
                        $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM);       \
-            $(LINK_LIB.CC/POST_HOOK)                                    \
+            $(LINK_LIB.CXX/POST_HOOK)                                    \
             rm -f $@.1; ln -s $@ $@.1;                                  \
             [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \
             if [ \"$(CROSS_COMPILE_ARCH)\" = \"\" ] ; then                    \
               if [ -x /usr/sbin/selinuxenabled ] ; then                 \
                 /usr/sbin/selinuxenabled;                               \