make/linux/makefiles/rules.make

*** 25,46 ****
  # Common rules/macros for the vm, adlc.
  
  # Tell make that .cpp is important
  .SUFFIXES: .cpp $(SUFFIXES)
  
- # For now.  Other makefiles use CPP as the c++ compiler, but that should really
- # name the preprocessor.
- ifeq    ($(CCC),)
- CCC             = $(CPP)
- endif
- 
  DEMANGLER       = c++filt
  DEMANGLE        = $(DEMANGLER) < $@ > .$@ && mv -f .$@ $@
  
! # $(CC) is the c compiler (cc/gcc), $(CCC) is the c++ compiler (CC/g++).
! C_COMPILE       = $(CC) $(CPPFLAGS) $(CFLAGS)
! CC_COMPILE      = $(CCC) $(CPPFLAGS) $(CFLAGS)
  
  AS.S            = $(AS) $(ASFLAGS)
  
  COMPILE.c       = $(C_COMPILE) -c
  GENASM.c        = $(C_COMPILE) -S
--- 25,40 ----
  # Common rules/macros for the vm, adlc.
  
  # Tell make that .cpp is important
  .SUFFIXES: .cpp $(SUFFIXES)
  
  DEMANGLER       = c++filt
  DEMANGLE        = $(DEMANGLER) < $@ > .$@ && mv -f .$@ $@
  
! # $(CC) is the c compiler (cc/gcc), $(CXX) is the c++ compiler (CC/g++).
! C_COMPILE       = $(CC) $(CXXFLAGS) $(CFLAGS)
! CC_COMPILE      = $(CXX) $(CXXFLAGS) $(CFLAGS)
  
  AS.S            = $(AS) $(ASFLAGS)
  
  COMPILE.c       = $(C_COMPILE) -c
  GENASM.c        = $(C_COMPILE) -S
*** 48,68 ****
  LINK_LIB.c      = $(CC) $(LFLAGS) $(SHARED_FLAG)
  PREPROCESS.c    = $(C_COMPILE) -E
  
  COMPILE.CC      = $(CC_COMPILE) -c
  GENASM.CC       = $(CC_COMPILE) -S
! LINK.CC         = $(CCC) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS)
! LINK_NOPROF.CC  = $(CCC) $(LFLAGS) $(AOUT_FLAGS)
! LINK_LIB.CC     = $(CCC) $(LFLAGS) $(SHARED_FLAG)
  PREPROCESS.CC   = $(CC_COMPILE) -E
  
  # cross compiling the jvm with c2 requires host compilers to build
  # adlc tool
  
! HOST.CC_COMPILE      = $(HOSTCPP) $(CPPFLAGS) $(CFLAGS)
  HOST.COMPILE.CC      = $(HOST.CC_COMPILE) -c
! HOST.LINK_NOPROF.CC  = $(HOSTCPP) $(LFLAGS) $(AOUT_FLAGS)
  
  
  # Effect of REMOVE_TARGET is to delete out-of-date files during "gnumake -k".
  REMOVE_TARGET   = rm -f $@
  
--- 42,62 ----
  LINK_LIB.c      = $(CC) $(LFLAGS) $(SHARED_FLAG)
  PREPROCESS.c    = $(C_COMPILE) -E
  
  COMPILE.CC      = $(CC_COMPILE) -c
  GENASM.CC       = $(CC_COMPILE) -S
! LINK.CC         = $(CXX) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS)
! LINK_NOPROF.CC  = $(CXX) $(LFLAGS) $(AOUT_FLAGS)
! LINK_LIB.CC     = $(CXX) $(LFLAGS) $(SHARED_FLAG)
  PREPROCESS.CC   = $(CC_COMPILE) -E
  
  # cross compiling the jvm with c2 requires host compilers to build
  # adlc tool
  
! HOST.CC_COMPILE      = $(HOSTCXX) $(CXXFLAGS) $(CFLAGS)
  HOST.COMPILE.CC      = $(HOST.CC_COMPILE) -c
! HOST.LINK_NOPROF.CC  = $(HOSTCXX) $(LFLAGS) $(AOUT_FLAGS)
  
  
  # Effect of REMOVE_TARGET is to delete out-of-date files during "gnumake -k".
  REMOVE_TARGET   = rm -f $@