diff --git a/config/CONFIG.solaris b/config/CONFIG.solaris index 540002650..e91fc27f7 100644 --- a/config/CONFIG.solaris +++ b/config/CONFIG.solaris @@ -14,9 +14,11 @@ ARCH_CLASS = solaris # Compiler and utility invocation (supply path to compiler here) # (with warning flags built in) # Paths to compilers -GCC = /opt/gnu/bin/gcc +GCC = /usr/local/bin/gcc ACC = $(SPARCWORKS)/bin/cc # SUNCC doesn't exist under Solaris +G++ = /usr/local/bin/g++ +CCC = $(SPARCWORKS)/bin/CC # # required by sun's C++ compiler @@ -30,8 +32,6 @@ ARCMD = $($(CPLUSPLUS)_AR) $@ RANLIB = YACC = $(EYACC) LEX = $(ELEX) -G++ = /opt/gnu/bin/g++ -CCC = /opt/SUNWspro/bin/CC CP=cp MV=mv diff --git a/config/CONFIG_SITE.solaris b/config/CONFIG_SITE.solaris index 3c7081cf9..fcbf7a514 100644 --- a/config/CONFIG_SITE.solaris +++ b/config/CONFIG_SITE.solaris @@ -23,4 +23,7 @@ SPARCWORKS = /opt/SUNWspro #SPECIAL_LANG = $(SPARCWORKS)/lib SPECIAL_LANG = . +# APS overrides of CONFIG.solaris definitions +GCC = /opt/gnu/bin/gcc +G++ = /opt/gnu/bin/g++