diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-01-17 20:05:40 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-01-17 20:05:40 +0000 |
| commit | 27934996c8eb8082fec9076a3038dd4a4d0d2b16 (patch) | |
| tree | bb977d87decf4b1cc9a9577fb80b1b96437f43c0 /aclocal.m4 | |
| parent | ead16e49c357aa5b50c4793f37b485e895ae18b0 (diff) | |
| download | haskell-27934996c8eb8082fec9076a3038dd4a4d0d2b16.tar.gz | |
Reinstate the OS X flags in the LDFLAGS etc variables
I expect this will fix:
http://www.haskell.org/pipermail/cvs-ghc/2011-January/059098.html
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index e6410d7de5..84fb2b1a47 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -21,16 +21,12 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS], # but we don't 16-byte align things. Thus drop # back to generic i686 compatibility. Trac #2983. $2="$$2 -march=i686 -m32" - # It's not clear if $3 flags will be given to gcc or ld, - # and they accept different flags, so for now do nothing - # $3="$$3 -march=i686 -m32" + $3="$$3 -march=i686 -m32" $4="$$4 -march=i686 -m32" ;; x86_64-apple-darwin) $2="$$2 -m64" - # It's not clear if $3 flags will be given to gcc or ld, - # and they accept different flags, so for now do nothing - # $3="$$3 -m64" + $3="$$3 -m64" $4="$$4 -m64" ;; esac @@ -39,9 +35,7 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS], i386-apple-darwin|x86_64-apple-darwin) # We support back to OS X 10.5 $2="$$2 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" - # It's not clear if $3 flags will be given to gcc or ld, - # and they accept different flags, so for now do nothing - # $3="$$3 -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 |