From b7347c4eab9bd6edbb84d8a5532b7e8f94bba45d Mon Sep 17 00:00:00 2001 From: Steve Huston Date: Wed, 5 Sep 2001 16:00:56 +0000 Subject: ChangeLogTag:Wed Sep 05 12:00:42 2001 Steve Huston --- ChangeLog | 5 +++++ ChangeLogs/ChangeLog-02a | 5 +++++ ChangeLogs/ChangeLog-03a | 5 +++++ include/makeinclude/platform_aix4_g++.GNU | 3 ++- 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6977deb0e30..2aac8ab6ee5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Sep 05 12:00:42 2001 Steve Huston + + * include/makeinclude/platform_aix4_g++.GNU: Sets ACE_AIX_VERS rather + than separate major/minor; see entry below for further info. + Wed Sep 05 11:52:39 2001 Steve Huston * ace/config-aix5.1.h: New config file for AIX 5L, version 5.1, diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 6977deb0e30..2aac8ab6ee5 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,8 @@ +Wed Sep 05 12:00:42 2001 Steve Huston + + * include/makeinclude/platform_aix4_g++.GNU: Sets ACE_AIX_VERS rather + than separate major/minor; see entry below for further info. + Wed Sep 05 11:52:39 2001 Steve Huston * ace/config-aix5.1.h: New config file for AIX 5L, version 5.1, diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 6977deb0e30..2aac8ab6ee5 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,8 @@ +Wed Sep 05 12:00:42 2001 Steve Huston + + * include/makeinclude/platform_aix4_g++.GNU: Sets ACE_AIX_VERS rather + than separate major/minor; see entry below for further info. + Wed Sep 05 11:52:39 2001 Steve Huston * ace/config-aix5.1.h: New config file for AIX 5L, version 5.1, diff --git a/include/makeinclude/platform_aix4_g++.GNU b/include/makeinclude/platform_aix4_g++.GNU index cf611c443b0..3c2ababa8a1 100644 --- a/include/makeinclude/platform_aix4_g++.GNU +++ b/include/makeinclude/platform_aix4_g++.GNU @@ -34,10 +34,11 @@ endif # grab it here and pass it all to the compiler as well. AIX_MAJOR_VERS := $(shell uname -v) AIX_MINOR_VERS := $(shell uname -r) +AIX_VERS := $(AIX_MAJOR_VERS)0$(AIX_MINOR_VERS) CC = gcc CXX = g++ -CFLAGS += -W -Wall -pipe -mcpu=common -DACE_AIX_MAJOR_VERS=$(AIX_MAJOR_VERS) -DACE_AIX_MINOR_VERS=$(AIX_MINOR_VERS) +CFLAGS += -W -Wall -pipe -mcpu=common -DACE_AIX_VERS=$(AIX_VERS) CCFLAGS += $(CFLAGS) -fno-implicit-templates DCFLAGS += -g DLD = $(CXX) -- cgit v1.2.1