diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-12-07 01:00:33 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-12-07 01:00:33 +0000 |
| commit | 75cd9c50ea68a5e426e3105735713b8015d63413 (patch) | |
| tree | d42739ff3a6766b255264844527861e9efb05ffe /aclocal.m4 | |
| parent | c0eb9d997653da4357873829990cc338475bca39 (diff) | |
| download | haskell-75cd9c50ea68a5e426e3105735713b8015d63413.tar.gz | |
Make CPPFLAGS variables, as well as CFLAGS and LDFLAGS
This fixes the "does unsetenv return void" test in the unix package on
OS X, if I tell it to make 10.4-compatible binaries. The test uses
CPPFLAGS but not CFLAGS, so it thought it returned int (as it was
in 10.5-mode), but the C compiler (using CFLAGS, so in 10.4 mode)
thought it returned void.
I also added CONF_LD_OPTS_STAGE$3 to the list of things in LDFLAGS,
which looks like an accidental ommission.
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 4701bc9354..f5ae279eb8 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -9,7 +9,7 @@ # Set the C and LD flags for a given platform AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS], [ - AC_MSG_CHECKING([Setting up $2 and $3]) + AC_MSG_CHECKING([Setting up $2, $3 and $4]) case $$1 in i386-apple-darwin) # By default, gcc on OS X will generate SSE @@ -18,10 +18,12 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS], # back to generic i686 compatibility. Trac #2983. $2="$$2 -march=i686 -m32" $3="$$3 -march=i686 -m32" + $4="$$4 -march=i686 -m32" ;; x86_64-apple-darwin) $2="$$2 -m64" $3="$$3 -m64" + $4="$$4 -m64" ;; esac @@ -30,6 +32,7 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS], # We support back to OS X 10.5 $2="$$2 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" $3="$$3 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" + $4="$$4 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" ;; esac |