diff options
| author | Bernard Normier <bernard@zeroc.com> | 2006-06-28 14:23:04 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2006-06-28 14:23:04 +0000 |
| commit | 3cf12ff0eedd1df92ab635a92e1a290414145d9a (patch) | |
| tree | 9bfa985170de6b6bd52ded0389a8db54c8407643 /cpp | |
| parent | Fix compile error (diff) | |
| download | ice-3cf12ff0eedd1df92ab635a92e1a290414145d9a.tar.bz2 ice-3cf12ff0eedd1df92ab635a92e1a290414145d9a.tar.xz ice-3cf12ff0eedd1df92ab635a92e1a290414145d9a.zip | |
Solaris x86/amd64 support
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/Make.rules.SunOS | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/cpp/config/Make.rules.SunOS b/cpp/config/Make.rules.SunOS index 439f9ebef7d..ce9a733c0f9 100644 --- a/cpp/config/Make.rules.SunOS +++ b/cpp/config/Make.rules.SunOS @@ -19,6 +19,13 @@ # CXX = CC +# This variable is used to determine the machine type. +# For SUN UltraSPARC machines: sun4u +# For x86/x64 machines: i86pc +# +MACHINE_TYPE := $(shell uname -m) + + ifeq ($(CXX),CC) # # Sun CC @@ -30,7 +37,12 @@ ifeq ($(CXX),CC) CCVERSION = $(filter 5.%, $(shell CC -V 2>&1)) ifeq ($(LP64),yes) - CXXARCHFLAGS = -xarch=v9 + ifeq ($(MACHINE_TYPE),sun4u) + CXXARCHFLAGS = -xarch=v9 + endif + ifeq ($(MACHINE_TYPE),i86pc) + CXXARCHFLAGS = -xarch=amd64 + endif endif ifeq ($(CCVERSION),5.3) @@ -81,7 +93,7 @@ ifeq ($(CXX),CC) mklib = $(CXX) -xar -o $(1) $(2) - LDPLATFORMFLAGS = -R $(install_libdir) + LDPLATFORMFLAGS = -R $(install_libdir) -z text endif @@ -120,7 +132,12 @@ LIBS = $(BZIP2_RPATH_LINK) -lIce $(BASELIBS) ICEUTIL_OS_LIBS = -lpthread -lrt ICE_OS_LIBS = -ldl -lsocket -lp64suffix = /sparcv9 +ifeq ($(MACHINE_TYPE),sun4u) + lp64suffix = /sparcv9 +endif +ifeq ($(MACHINE_TYPE),i86pc) + lp64suffix = /amd64 +endif ifeq ($(LP64),yes) export LD_LIBRARY_PATH_64 := $(libdir):$(LD_LIBRARY_PATH_64) |