diff options
author | Matthew Newhook <matthew@zeroc.com> | 2007-06-12 00:25:05 -0400 |
---|---|---|
committer | Matthew Newhook <matthew@zeroc.com> | 2007-06-12 00:25:05 -0400 |
commit | 50246410756bd974e78b3e14143f76b476228372 (patch) | |
tree | 6d4e8e9c5f6e803ff27b419c660c57b5ee88704a /cpp | |
parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
download | ice-50246410756bd974e78b3e14143f76b476228372.tar.bz2 ice-50246410756bd974e78b3e14143f76b476228372.tar.xz ice-50246410756bd974e78b3e14143f76b476228372.zip |
Solaris gcc fixes.
Diffstat (limited to 'cpp')
-rw-r--r-- | cpp/config/Make.rules.SunOS | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/config/Make.rules.SunOS b/cpp/config/Make.rules.SunOS index dd7e94199a9..179d0beeb60 100644 --- a/cpp/config/Make.rules.SunOS +++ b/cpp/config/Make.rules.SunOS @@ -17,7 +17,7 @@ # comment it out and define CXX=<desired-compiler> in your environment. # If CXX is not defined anywhere, the default (from gmake) is g++. # -CXX = CC +CXX ?= CC # This variable is used to determine the machine type. # For SUN UltraSPARC machines: sun4u @@ -114,6 +114,8 @@ endif ifeq ($(CXX),g++) + CC = gcc + ifeq ($(LP64),yes) CXXARCHFLAGS = -m64 endif |