summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Hazel <ph10@hermes.cam.ac.uk>2005-02-16 16:40:22 +0000
committerPhilip Hazel <ph10@hermes.cam.ac.uk>2005-02-16 16:40:22 +0000
commit4e01f9d6a10601a4f89b0bd2bd2642cda95a92dd (patch)
tree3b888aebe137feab042ebc6f634ab32082b0e698
parent1e70f85bc1b5cebe658c167e7392e66a7ab440fc (diff)
Update AIX configuration file as per Mike Meredith's message.
-rw-r--r--doc/doc-txt/ChangeLog4
-rw-r--r--src/OS/Makefile-AIX12
2 files changed, 11 insertions, 5 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 9941ed9ec..b01485f83 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.80 2005/02/16 16:28:36 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.81 2005/02/16 16:40:22 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -384,6 +384,8 @@ Exim version 4.50
81. Included the latest eximstats from Steve (adds average sizes to HTML Top
tables).
+82. Updated OS/Makefile-AIX as per message from Mike Meredith.
+
----------------------------------------------------
See the note above about the 4.44 and 4.50 releases.
diff --git a/src/OS/Makefile-AIX b/src/OS/Makefile-AIX
index 42659a6cd..489ffe3b1 100644
--- a/src/OS/Makefile-AIX
+++ b/src/OS/Makefile-AIX
@@ -1,23 +1,27 @@
-# $Cambridge: exim/src/OS/Makefile-AIX,v 1.1 2004/10/06 15:07:39 ph10 Exp $
+# $Cambridge: exim/src/OS/Makefile-AIX,v 1.2 2005/02/16 16:40:22 ph10 Exp $
# Exim: OS-specific make file for AIX
# Written by Nick Waterman (nick@cimio.co.uk)
+# Modified by PH following a message from Mike Meredith
# Note that the output of uname -m is probably not what Philip expected,
# so you might end up with more build-AIX-random_number directories than
# you expected if you have too many AIX boxes, but it seems to work... I
# blame IBM.
-# Note that nowadays you have to pay extra for a compiler with AIX!
+# Note that nowadays you have to pay extra for a cc compiler with AIX!
-CC=cc
+CC=gcc
# This needs to be in here rather than os.h-AIX because of regexp stuff.
# basically strchr is a #define, which means "extern char *strchr()"
# ruins things. __STR31__ seems to get around this by magic. The AIX
# include files are quite a confusing maze.
+# Mike M says this is not necessary any more; possibly this is related to
+# using gcc. Commented out by PH.
+#CFLAGS = -D__STR31__
-CFLAGS = -D__STR31__
+CFLAGS = -mcpu=power4 -maix64 -O3
# Needed for vfork() and vfork() only?