make/solaris/makefiles/sparcWorks.make

*** 24,49 ****
  
  # Compiler-specific flags for sparcworks.
  
  # tell make which C and C++ compilers to use
  CC      = cc
! CPP     = CC
  
  # Note that this 'as' is an older version of the Sun Studio 'fbe', and will
  #   use the older style options. The 'fbe' options will match 'cc' and 'CC'.
  AS      = /usr/ccs/bin/as
  
  NM      = /usr/ccs/bin/nm
  NAWK    = /bin/nawk
  
  REORDER_FLAG = -xF
  
! # Check for the versions of C++ and C compilers ($CPP and $CC) used. 
  
  # Get the last thing on the line that looks like x.x+ (x is a digit).
  COMPILER_REV := \
! $(shell $(CPP) -V 2>&1 | sed -n 's/^.*[ ,\t]C++[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p')
  C_COMPILER_REV := \
  $(shell $(CC) -V 2>&1 | sed -n 's/^.*[ ,\t]C[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p')
  
  # Pick which compiler is validated
  ifeq ($(JRE_RELEASE_VER),1.6.0)
--- 24,49 ----
  
  # Compiler-specific flags for sparcworks.
  
  # tell make which C and C++ compilers to use
  CC      = cc
! CXX     = CC
  
  # Note that this 'as' is an older version of the Sun Studio 'fbe', and will
  #   use the older style options. The 'fbe' options will match 'cc' and 'CC'.
  AS      = /usr/ccs/bin/as
  
  NM      = /usr/ccs/bin/nm
  NAWK    = /bin/nawk
  
  REORDER_FLAG = -xF
  
! # Check for the versions of C++ and C compilers ($CXX and $CC) used. 
  
  # Get the last thing on the line that looks like x.x+ (x is a digit).
  COMPILER_REV := \
! $(shell $(CXX) -V 2>&1 | sed -n 's/^.*[ ,\t]C++[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p')
  C_COMPILER_REV := \
  $(shell $(CC) -V 2>&1 | sed -n 's/^.*[ ,\t]C[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p')
  
  # Pick which compiler is validated
  ifeq ($(JRE_RELEASE_VER),1.6.0)
*** 516,526 ****
  #OPT_CFLAGS += -Qoption ccfe -xglobalstatic
  #DEBUG_CFLAGS += -Qoption ccfe -xglobalstatic
  #FASTDEBUG_CFLAGS += -Qoption ccfe -xglobalstatic
  
  ifeq    (${COMPILER_REV_NUMERIC}, 502)
! COMPILER_DATE := $(shell $(CPP) -V 2>&1 | sed -n '/^.*[ ]C++[ ]\([1-9]\.[0-9][0-9]*\)/p' | awk '{ print $$NF; }')
  ifeq    (${COMPILER_DATE}, 2001/01/31)
  # disable -g0 in fastdebug since SC6.1 dated 2001/01/31 seems to be buggy
  # use an innocuous value because it will get -g if it's empty
  FASTDEBUG_CFLAGS = -c
  endif
--- 516,526 ----
  #OPT_CFLAGS += -Qoption ccfe -xglobalstatic
  #DEBUG_CFLAGS += -Qoption ccfe -xglobalstatic
  #FASTDEBUG_CFLAGS += -Qoption ccfe -xglobalstatic
  
  ifeq    (${COMPILER_REV_NUMERIC}, 502)
! COMPILER_DATE := $(shell $(CXX) -V 2>&1 | sed -n '/^.*[ ]C++[ ]\([1-9]\.[0-9][0-9]*\)/p' | awk '{ print $$NF; }')
  ifeq    (${COMPILER_DATE}, 2001/01/31)
  # disable -g0 in fastdebug since SC6.1 dated 2001/01/31 seems to be buggy
  # use an innocuous value because it will get -g if it's empty
  FASTDEBUG_CFLAGS = -c
  endif