summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2005-02-16 04:19:00 +0000
committerBernard Normier <bernard@zeroc.com>2005-02-16 04:19:00 +0000
commit0d87f245c848e3d0deb1ad44c35a26103196debd (patch)
tree9e6502699a9243d563c9bb786f766b4cc76c38ec /cpp
parentAdded Freeze properties back. (I accidentally deleted those previously.) (diff)
downloadice-0d87f245c848e3d0deb1ad44c35a26103196debd.tar.bz2
ice-0d87f245c848e3d0deb1ad44c35a26103196debd.tar.xz
ice-0d87f245c848e3d0deb1ad44c35a26103196debd.zip
g++ improvements
Diffstat (limited to 'cpp')
-rw-r--r--cpp/CHANGES2
-rw-r--r--cpp/INSTALL.SOLARIS19
-rw-r--r--cpp/config/Make.rules.SunOS7
3 files changed, 23 insertions, 5 deletions
diff --git a/cpp/CHANGES b/cpp/CHANGES
index 7a65f80315b..e34b89b34e7 100644
--- a/cpp/CHANGES
+++ b/cpp/CHANGES
@@ -1,6 +1,8 @@
Changes since version 2.0.0
---------------------------
+- Added support for g++ builds on Solaris.
+
- Fixed IcePack node and registry database environment names. They
have been changed to be the name of the node for IcePack nodes and
'Registry' for the IcePack registry. This means that you can now
diff --git a/cpp/INSTALL.SOLARIS b/cpp/INSTALL.SOLARIS
index e02c4c8fa7a..84ecc2b3914 100644
--- a/cpp/INSTALL.SOLARIS
+++ b/cpp/INSTALL.SOLARIS
@@ -23,6 +23,12 @@ The following Sun compilers are supported:
new linker scoping feature to reduce the number of symbols exported
by Ice shared libraries.
+Builds with the following compilers are expected to succeed, but these
+compilers are not supported at this time:
+- Sun C++ 5.6 and 5.7 (Sun Studio 9 and Sun Studio 10)
+
+- GCC 3.4.2
+
Third-party libraries
---------------------
@@ -64,12 +70,12 @@ GNU Make 3.80 is required to build Ice on SPARC/Solaris. You can
download GNU Make from http://www.sunfreeware.com.
-Python 2.2
+Python 2.x
----------
-To run the automated test suite, you will need Python 2.2. If you have
-no interest in running the test scripts, Python is not required. You
-can download Python from http://www.sunfreeware.com.
+To run the automated test suite, you will need Python 2.2 or greater.
+If you have no interest in running the test scripts, Python is not
+required. You can download Python from http://www.sunfreeware.com.
======================================================================
@@ -90,6 +96,11 @@ file. Make sure that the paths for the third-party libraries are set
correctly if they are not installed in the default location /usr/lib
and /usr/include.
+If you want to build with g++ instead of CC, edit
+config/Make.rules.SunOS and change or comment out the CXX = <compiler>
+line (at the top of the file). The default value for CXX with GNU
+make is g++.
+
Now you're ready to build Ice:
$ gmake
diff --git a/cpp/config/Make.rules.SunOS b/cpp/config/Make.rules.SunOS
index a7653c6fc50..671d87182cc 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
ifeq ($(CXX),CC)
#
@@ -83,6 +83,11 @@ ifeq ($(CXX),gcc)
endif
ifeq ($(CXX),g++)
+
+ ifeq ($(LP64),yes)
+ CXXARCHFLAGS := -m64
+ endif
+
CXXFLAGS = $(CXXARCHFLAGS) -ftemplate-depth-128 -fPIC -Wall -D_REENTRANT
ifeq ($(OPTIMIZE),yes)