ChangeLogTag:Tue Apr 10 18:35:22 2001 Steve Huston <shuston@riverace.com>

2 files changed, 32 insertions, 5 deletions

diff --git a/include/makeinclude/platform_hpux_aCC.GNU b/include/makeinclude/platform_hpux_aCC.GNU
index 51d968c7f64..c6e3c45c8dd 100644
--- a/include/makeinclude/platform_hpux_aCC.GNU
+++ b/include/makeinclude/platform_hpux_aCC.GNU
@@ -30,6 +30,9 @@ endif
 ifeq (,$(optimize))
   optimize = 0
 endif
+ifeq (,$(stdcpplib))
+  stdcpplib = 1
+endif
 ifeq (,$(threads))
   threads = 1
 endif
@@ -39,8 +42,24 @@ HPVERS_WORDS := $(subst ., ,$(shell uname -r))
 HPUX_VERS	:= $(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS)))
 #
 CC		= /bin/cc
-CXX		= /opt/aCC/bin/aCC
-#
+CXX		= aCC
+
+# Extract the compiler version number. If it's A.03.27 (on HP-UX 11) or
+# A.01.27 (on HP-UX 10.20) then we can turn on the standard C++ library
+# usage, else we need to stick with the old one.
+CXXVERS_WORDS := $(subst ., , $(shell $(CXX) -V 2>&1))
+CXXVERS := $(word 8, $(CXXVERS_WORDS))
+ifneq (27,$(CXXVERS))
+  stdcpplib = 0
+endif
+
+ifeq (1,$(stdcpplib))
+  CCFLAGS += -AA -DACE_HAS_STANDARD_CPP_LIBRARY
+# Compile errors using -AA and +noeh together - HP support call 3100620459
+# -- Steve Huston, April 10, 2001.
+  exceptions = 1
+endif
+
 # Set the appropriate preprocessor defs for threading based on OS version.
 # If the user has requested building without threads, then don't set any
 # for 10.20, but for 11.00, the default is to use threads, so explicitly
diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU
index e58c2f52a0e..5818885bc66 100644
--- a/include/makeinclude/platform_sunos5_sunc++.GNU
+++ b/include/makeinclude/platform_sunos5_sunc++.GNU
@@ -44,6 +44,9 @@ endif
 ifeq (,$(distrib))
   distrib = 0
 endif
+ifeq (,$(stdcpplib))
+  stdcpplib = 1
+endif
 ifeq (,$(threads))
   threads = 1
 endif
@@ -108,10 +111,15 @@ else  # ! 4.2
       #### with early releases of CC 5.0.  And, use old iostreams.
       CCFLAGS += -instances=explicit
       ifeq (C++ 5.0,$(findstring C++ 5.0,$(CC_VERSION)))
-        CCFLAGS += -library=iostream,no%Cstd
+        ifeq (1,$(stdcpplib))
+          CCFLAGS += -library=Cstd
+        else
+          CCFLAGS += -library=iostream,no%Cstd -DACE_USES_OLD_IOSTREAMS
+        endif # stdcpplib
       else
-        #### SunCC 5.1 seems to need the std cpp lib
-        CCFLAGS += -library=iostream
+        ifeq (0,$(stdcpplib))
+          CCFLAGS += -library=iostream -DACE_USES_OLD_IOSTREAMS
+        endif # stdcpplib
       endif # CC 5.0
     endif # compat4 requested
   endif # CC 5.0 or later