summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorSimon Marlow <simonmar@microsoft.com>2007-08-21 15:15:53 +0000
committerSimon Marlow <simonmar@microsoft.com>2007-08-21 15:15:53 +0000
commit2ebe8addfaae2bc65e6b87ad369928b02053014f (patch)
tree40444e55dd6b6a6c3d1b575203b9ed140157f9dc /Makefile
parent04a42d01c41923baf66eacabf6ffb22dfe367108 (diff)
downloadhaskell-2ebe8addfaae2bc65e6b87ad369928b02053014f.tar.gz
FIX #1427, #1569: gcc 4.2.x needs -fno-toplevel-reorder
We now have various flags that need to be passed to gcc, but only if the local gcc version supports them. So instead of wiring this knowledge into ghc when it is built, we now put these "extra gcc flags" into a text file in $libdir, extra-gcc-flags, which is created by configure. It is also created by the configure script of a binary distribution, so a binary dist is independent of the gcc version used to build it. Hopefully I got the binary-dist stuff right, but binary dists aren't currently working so we'll need to come back and check this.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 981fec0d8c..192a0d5cc1 100644
--- a/Makefile
+++ b/Makefile
@@ -199,6 +199,11 @@ install ::
endif
endif
+# Install gcc-extra-opts
+install ::
+ @$(INSTALL_DIR) $(libdir)
+ $(INSTALL_DATA) $(INSTALL_OPTS) extra-gcc-opts $(libdir)
+
install-docs ::
@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
for i in $(SUBDIRS); do \
@@ -262,6 +267,7 @@ BIN_DIST_TOP= distrib/Makefile \
ANNOUNCE \
LICENSE \
install-sh \
+ extra-gcc-opts.in \
config.guess \
config.sub \
aclocal.m4