make/linux/makefiles/adlc.make

@@ -59,14 +59,14 @@
 # set INCLUDES for C preprocessor
 Src_Dirs_I += $(GAMMADIR)/src/share/vm/adlc $(GENERATED)
 INCLUDES += $(Src_Dirs_I:%=-I%)
 
 # set flags for adlc compilation
-CPPFLAGS = $(SYSDEFS) $(INCLUDES)
+CXXFLAGS = $(SYSDEFS) $(INCLUDES)
 
 # Force assertions on.
-CPPFLAGS += -DASSERT
+CXXFLAGS += -DASSERT
 
 # CFLAGS_WARN holds compiler options to suppress/enable warnings.
 # Compiler warnings are treated as errors
 CFLAGS_WARN = -Werror
 CFLAGS += $(CFLAGS_WARN)

@@ -107,11 +107,11 @@
 
 all: $(EXEC)
 
 $(EXEC) : $(OBJECTS)
         @echo Making adlc
-        $(QUIETLY) $(HOST.LINK_NOPROF.CC) -o $(EXEC) $(OBJECTS)
+        $(QUIETLY) $(HOST.LINK_NOPROF.CXX) -o $(EXEC) $(OBJECTS)
 
 # Random dependencies:
 $(OBJECTS): opcodes.hpp classes.hpp adlc.hpp adlcVMDeps.hpp adlparse.hpp archDesc.hpp arena.hpp dict2.hpp filebuff.hpp forms.hpp formsopt.hpp formssel.hpp
 
 # The source files refer to ostream.h, which sparcworks calls iostream.h

@@ -209,18 +209,18 @@
     print }'
 
 $(OUTDIR)/%.o: %.cpp
         @echo Compiling $<
         $(QUIETLY) $(REMOVE_TARGET)
-        $(QUIETLY) $(HOST.COMPILE.CC) -o $@ $< $(COMPILE_DONE)
+        $(QUIETLY) $(HOST.COMPILE.CXX) -o $@ $< $(COMPILE_DONE)
 
 # Some object files are given a prefix, to disambiguate
 # them from objects of the same name built for the VM.
 $(OUTDIR)/adlc-%.o: %.cpp
         @echo Compiling $<
         $(QUIETLY) $(REMOVE_TARGET)
-        $(QUIETLY) $(HOST.COMPILE.CC) -o $@ $< $(COMPILE_DONE)
+        $(QUIETLY) $(HOST.COMPILE.CXX) -o $@ $< $(COMPILE_DONE)
 
 # #########################################################################
 
 clean   :
         rm $(OBJECTS)