From e488cc27eb20e1b96cb0751249b19236a7e373ea Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 14 Nov 2013 12:08:03 +0200
Subject: Drop support for aCC3

---
 dist/examples/build/cxx/compilers.make | 16 ++--------------
 dist/examples/build/cxx/rules.make     | 18 +++---------------
 2 files changed, 5 insertions(+), 29 deletions(-)

(limited to 'dist')

diff --git a/dist/examples/build/cxx/compilers.make b/dist/examples/build/cxx/compilers.make
index fb9dc45..9f6e64a 100644
--- a/dist/examples/build/cxx/compilers.make
+++ b/dist/examples/build/cxx/compilers.make
@@ -65,27 +65,15 @@ endif
 
 # HP C++ (aCC)
 #
-# aCC3 and aCC6 are two very different compilers so we will call them
-# hp3 and hp6.
-#
-
-# 3
-ifeq ($(cxx_id),)
-ifeq ($(shell echo '$(cxx_sign)' | sed -e 's/^[^ ]* HP ANSI C.. .* A\.03\..*$$//'),)
-cxx_id := hp3
-endif
-endif
-
-# 6
 ifeq ($(cxx_id),)
 ifeq ($(shell echo '$(cxx_sign)' | sed -e 's/^[^ ]* HP aC..\/ANSI C .* A\.06\..*$$//'),)
-cxx_id := hp6
+cxx_id := hp
 endif
 endif
 
 ifeq ($(cxx_id),)
 ifeq ($(shell echo '$(cxx_sign)' | sed -e 's/^[^ ]* HP C\/aC.. .* A\.06\..*$$//'),)
-cxx_id := hp6
+cxx_id := hp
 endif
 endif
 
diff --git a/dist/examples/build/cxx/rules.make b/dist/examples/build/cxx/rules.make
index 541d700..c510168 100644
--- a/dist/examples/build/cxx/rules.make
+++ b/dist/examples/build/cxx/rules.make
@@ -32,23 +32,11 @@ ifeq ($(cxx_id),sun)
 endif
 
 
-# HP aCC3
+# HP aCC
 #
-ifeq ($(cxx_id),hp3)
+ifeq ($(cxx_id),hp)
 
-  # By default Xerces-C++ is built with -mt for aCC3.
-  # 849 : symbol to long, truncated to 4000
-  # 1039: incompatible vtable layout
-  #
-  CXXFLAGS := -AA -O -mt +W849 +W1039
-endif
-
-
-# HP aCC6
-#
-ifeq ($(cxx_id),hp6)
-
-  # By default Xerces-C++ is built with -mt for aCC6.
+  # By default Xerces-C++ is built with -mt for aCC.
   # 2334 no suitable copy constructor (e.g., for std::auto_ptr)
   #
   CXXFLAGS := -Aa -O -mt +W2334
-- 
cgit v1.1