diff options
| author | Ian Lynagh <igloo@earth.li> | 2007-07-05 21:52:40 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2007-07-05 21:52:40 +0000 |
| commit | fdf1cd0399158308769fcb2ab7e46e215a68d865 (patch) | |
| tree | f6681f1e4c419db48133e66e2279255b6d4cb17e /includes | |
| parent | e552cfc427d2734b9a9629f2ab1d22f493e775f6 (diff) | |
| download | haskell-fdf1cd0399158308769fcb2ab7e46e215a68d865.tar.gz | |
Update the in-tree GMP; fixes trac #832
gmp is now in a top-level directory and we only have the tarball in the
darcs repo. It gets untarred if it is needed.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/Makefile | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/includes/Makefile b/includes/Makefile index 4b89d52c39..e7292cd8a1 100644 --- a/includes/Makefile +++ b/includes/Makefile @@ -12,7 +12,7 @@ H_PLATFORM = ghcplatform.h # # All header files # -H_FILES = $(filter-out gmp.h $(H_CONFIG) $(H_PLATFORM),$(wildcard *.h)) gmp.h +H_FILES = $(filter-out $(H_CONFIG) $(H_PLATFORM),$(wildcard *.h)) ifneq "$(DOING_BIN_DIST)" "YES" @@ -27,20 +27,14 @@ ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO" SRC_CC_OPTS += -DTABLES_NEXT_TO_CODE endif -SRC_CC_OPTS += -I. -I../rts +SRC_CC_OPTS += -I. -I../rts -I../gmp/gmpbuild ifneq "$(GhcWithSMP)" "YES" SRC_CC_OPTS += -DNOSMP endif -boot :: gmp.h - all :: $(H_CONFIG) $(H_PLATFORM) -# gmp.h is copied from the GMP directory -gmp.h : $(FPTOOLS_TOP)/rts/gmp/gmp.h - $(CP) $< $@ - # The fptools configure script creates the configuration header file and puts it # in fptools/mk/config.h. We copy it down to here (without any PACKAGE_FOO # definitions to avoid clashes), prepending some make variables specifying cpp |