diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-03-01 07:39:14 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-03-01 07:39:14 +0000 |
| commit | 97802500e5c23a24b3383d1295809c2f577ad166 (patch) | |
| tree | 3b38be37b8da6a43db1d93d23c017c4ea2089c9c | |
| parent | 4a65aaf95cd5b0517d4af2abd3bf4548c7b04c6e (diff) | |
| download | ATCD-97802500e5c23a24b3383d1295809c2f577ad166.tar.gz | |
ChangeLogTag: Tue Mar 1 07:39:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | include/makeinclude/platform_hpux_aCC.GNU | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/include/makeinclude/platform_hpux_aCC.GNU b/include/makeinclude/platform_hpux_aCC.GNU index de5b6732fc6..6babb2db9f7 100644 --- a/include/makeinclude/platform_hpux_aCC.GNU +++ b/include/makeinclude/platform_hpux_aCC.GNU @@ -78,11 +78,6 @@ ifeq (1,$(stdcpplib)) # exceptions = 1 endif -ifeq (05,$(CXXMAJORVERS)) - # Warnings about binary incompatiblity - CCFLAGS += +W1016,1031 -endif - # Set the appropriate preprocessor defs for threading based on OS version # and specified compiler options. ifeq ($(threads),1) @@ -115,19 +110,27 @@ endif ifeq (03,$(CXXMAJORVERS)) # Suppress Warning 302 ((...) parameter list is a non-portable feature) CCFLAGS += +W302 -endif -CPPFLAGS += $(THR_DEFS) -D_HPUX_SOURCE -DHPUX_VERS=$(HPUX_VERS) -DACE_LACKS_PRAGMA_ONCE -ifeq (03,$(CXXMAJORVERS)) ifeq (57,$(CXXMINORVERS)) # aCC 3.57 has a bug. When a class has private constructors # and is trying to be created from a friend class we end up with # a compile error. We disable array optimization in the compiler - # by setting this environment variable. + # by setting this environment variable. HP CR JAGaf43094 + export aCC_ARRAY_OPT=OFF + endif + ifeq (60,$(CXXMINORVERS)) + # Same bug as above export aCC_ARRAY_OPT=OFF endif endif +ifeq (05,$(CXXMAJORVERS)) + # Warnings about binary incompatiblity + CCFLAGS += +W1016,1031 +endif + +CPPFLAGS += $(THR_DEFS) -D_HPUX_SOURCE -DHPUX_VERS=$(HPUX_VERS) -DACE_LACKS_PRAGMA_ONCE + # If exception support is explicitly disabled, tell the compiler. # This is not recommended since the run-time library can throw exceptions. ifneq ($(exceptions),1) |