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 /rts/Makefile | |
| 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 'rts/Makefile')
| -rw-r--r-- | rts/Makefile | 48 |
1 files changed, 5 insertions, 43 deletions
diff --git a/rts/Makefile b/rts/Makefile index cd96f7f813..2c5dcc4f4b 100644 --- a/rts/Makefile +++ b/rts/Makefile @@ -7,9 +7,6 @@ # .hc files are "Haskellized-C", compiled using the C compiler and # (possibly) the assembly-mangler. The GHC driver script # knows how to compile this stuff. -# -# Other sorta independent, compile-once subdirs are: -# gmp -- GNU multi-precision library (for Integer) #----------------------------------------------------------------------------- # Preamble @@ -254,46 +251,6 @@ endif # We use GMP's own configuration stuff, because it's all rather hairy # and not worth re-implementing in our Makefile framework. -ifneq "$(HaveLibGmp)" "YES" -ifneq "$(HaveFrameworkGMP)" "YES" -boot :: - if [ -f gmp/config.status ]; then \ - cd gmp && CC=$(WhatGccIsCalled) ./config.status; \ - else \ - cd gmp && CC=$(WhatGccIsCalled) $(SHELL) configure --enable-shared=no \ - --host=`echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g'`; \ - fi - -# Slight cheatage here to pass host as target, but x-compilation isn't supported by ghc. - -ifeq "$(way)" "" -all :: gmp/libgmp.a - -ifeq "$(DLLized)" "YES" -all :: $(DLL_PEN)/gmp.dll - -$(DLL_PEN)/gmp.dll: - $(MAKE) -C gmp gmp.dll - $(MV) gmp/gmp.dll $(DLL_PEN) -endif -endif - -install :: gmp/libgmp.a - -ifeq "$(way)" "" -clean distclean maintainer-clean :: - -$(MAKE) -C gmp MAKEFLAGS= $@ - -INSTALL_LIBS += gmp/libgmp.a -endif -endif - -gmp/libgmp.a :: - $(MAKE) -C gmp MAKEFLAGS= - @$(CP) gmp/.libs/libgmp.a gmp - @$(RANLIB) gmp/libgmp.a -endif - CLEAN_FILES += gmp/libgmp.a # Need to get the GMP vars in through CPP to package.conf.in, and put @@ -314,6 +271,11 @@ ifneq "$(GMP_LIB_DIRS)" "" SRC_LD_OPTS += -L$(GMP_LIB_DIRS) endif +SRC_CC_OPTS += -I../gmp/gmpbuild +SRC_HC_OPTS += -I../gmp/gmpbuild +SRC_HSC2HS_OPTS += -I../gmp/gmpbuild +SRC_LD_OPTS += -L../gmp/gmpbuild + #----------------------------------------------------------------------------- # # Building the GUM SysMan |