From 60714e2c04c5814faf560be5988ff4731ea70a65 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sun, 20 Apr 2008 19:58:56 +0000 Subject: [PATCH] Make the integer library to use more configurable Now you just set INTEGER_LIBRARY=integer-foo in build.mk --- libraries/Makefile | 7 ++++--- mk/config.mk.in | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libraries/Makefile b/libraries/Makefile index 9617dd4e0817..53a13e6a77dc 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -38,8 +38,8 @@ show: TOP=.. include $(TOP)/mk/boilerplate.mk -SUBDIRS = ghc-prim integer-gmp base array packedstring containers bytestring -SUBDIRS += old-locale old-time filepath directory +SUBDIRS = ghc-prim $(INTEGER_LIBRARY) base array packedstring +SUBDIRS += containers bytestring old-locale old-time filepath directory ifeq "$(GhcLibsWithUnix)" "YES" SUBDIRS += unix endif @@ -322,7 +322,8 @@ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ $(CABAL_HADDOCK_FLAGS); \ fi ifneq "$(HSCOLOUR)" "" -# We use */src rather than $*/src due to the integer-gmp/integer mismatch +# We use */src rather than $*/src due to the $(INTEGER_LIBRARY)/integer +# mismatch if ifBuildable/ifBuildable $*; then cp hscolour.css $*/dist/doc/html/*/src/; fi endif diff --git a/mk/config.mk.in b/mk/config.mk.in index 7d0e025eb0fe..daa6d699c950 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -349,6 +349,9 @@ MakefileDeps=YES #------------------------------------------------------------------------------ # Options for Libraries +# Which directory (in libraries/) contains the integer library? +INTEGER_LIBRARY=integer-gmp + # What extra ways to build the libraries in # In addition to the normal sequential way, the default is to also build # profiled prelude libraries.