summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2001-09-05 16:00:56 +0000
committerSteve Huston <shuston@riverace.com>2001-09-05 16:00:56 +0000
commitb7347c4eab9bd6edbb84d8a5532b7e8f94bba45d (patch)
tree8c290644803e2d4f221701c7d750f1ebadef8369
parentf590e3630061416a871889deb0b93e663e4cb3a8 (diff)
downloadATCD-b7347c4eab9bd6edbb84d8a5532b7e8f94bba45d.tar.gz
ChangeLogTag:Wed Sep 05 12:00:42 2001 Steve Huston <shuston@riverace.com>
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLogs/ChangeLog-02a5
-rw-r--r--ChangeLogs/ChangeLog-03a5
-rw-r--r--include/makeinclude/platform_aix4_g++.GNU3
4 files changed, 17 insertions, 1 deletions
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 <shuston@riverace.com>
+
+ * 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 <shuston@riverace.com>
* 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 <shuston@riverace.com>
+
+ * 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 <shuston@riverace.com>
* 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 <shuston@riverace.com>
+
+ * 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 <shuston@riverace.com>
* 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)