diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-08-15 11:06:52 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-08-15 11:06:52 +0000 |
| commit | 09a1750c396129f8b236410e35b3c583a802e087 (patch) | |
| tree | 49f7835d6ed427f872b9cfe1c42bf468f75e3a6a /ACE/include/makeinclude/platform_aix_ibm.GNU | |
| parent | 157e337d8fd91505f3fea0558d59f629ca1fc800 (diff) | |
| download | ATCD-09a1750c396129f8b236410e35b3c583a802e087.tar.gz | |
ChangeLogTag: Fri Aug 15 11:07:00 UTC 2008 Simon Massey <sma at prismtech dot com>
Diffstat (limited to 'ACE/include/makeinclude/platform_aix_ibm.GNU')
| -rw-r--r-- | ACE/include/makeinclude/platform_aix_ibm.GNU | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/ACE/include/makeinclude/platform_aix_ibm.GNU b/ACE/include/makeinclude/platform_aix_ibm.GNU index e31935d361b..d675201759b 100644 --- a/ACE/include/makeinclude/platform_aix_ibm.GNU +++ b/ACE/include/makeinclude/platform_aix_ibm.GNU @@ -109,7 +109,7 @@ else CCFLAGS += -qeh=v6 endif else - ifeq ($(XLCVERSION),0x0900) + ifeq ($(XLCVERSION),0x0800) CCFLAGS += -qflag=w:w ifeq ($(templates),manual) CCFLAGS += -qnotempinc -qnotemplateregistry @@ -122,8 +122,23 @@ else ifeq ($(exceptions),1) CCFLAGS += -qeh=v6 endif - else - CXX = echo "Unrecognized compiler version $(XLCVERSION)\n" + else + ifeq ($(XLCVERSION),0x0900) + CCFLAGS += -qflag=w:w + ifeq ($(templates),manual) + CCFLAGS += -qnotempinc -qnotemplateregistry + else + CCFLAGS += -qtemplateregistry=templateregistry.$(MAKEFILE) + endif + # According to documentation, default is -qeh, which is equivalent + # to -qeh=v5. Apparently 6.0 fixed some problems with nested + # try-catch blocks. + ifeq ($(exceptions),1) + CCFLAGS += -qeh=v6 + endif + else + CXX = echo "Unrecognized compiler version $(XLCVERSION)\n" + endif endif endif endif |