diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-07-11 15:14:48 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-07-11 15:14:48 +0000 |
| commit | 2a150d4b7d9b6cb7cca96b10749f406128ca57b6 (patch) | |
| tree | e00022904cea0b94a0c33fc56f3c8d2975af82e9 | |
| parent | 28a5c73a83e8f27c31cad02da07c81e4e6764303 (diff) | |
| download | haskell-2a150d4b7d9b6cb7cca96b10749f406128ca57b6.tar.gz | |
Split up Cabal configure flag variables for more flexibility
| -rw-r--r-- | libraries/Makefile | 4 | ||||
| -rw-r--r-- | mk/cabal-flags.mk | 18 | ||||
| -rw-r--r-- | utils/hsc2hs/Makefile | 10 |
3 files changed, 21 insertions, 11 deletions
diff --git a/libraries/Makefile b/libraries/Makefile index d7da0c170d..d5d1e82b3e 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -236,7 +236,9 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \ # makes that difficult. ALL_CONFIGURE_FLAGS = \ - $(INSTALL_CONFIGURE_FLAGS) \ + $(INSTALL_DIRS_CONFIGURE_FLAGS) \ + $(USE_STAGE1_CONFIGURE_FLAGS) \ + $(COMMON_CONFIGURE_FLAGS) \ --haddock-options="--use-contents=../index.html \ --use-index=../doc-index.html" \ $(CONFIGURE_OPTS) diff --git a/mk/cabal-flags.mk b/mk/cabal-flags.mk index ad01deb667..cabe3285a8 100644 --- a/mk/cabal-flags.mk +++ b/mk/cabal-flags.mk @@ -44,7 +44,7 @@ endif # We put non-existant paths in when configuring things that we plan to # install, as we require that builds don't depend on these paths when # making bindists. -INSTALL_CONFIGURE_FLAGS = \ +INSTALL_DIRS_CONFIGURE_FLAGS = \ --prefix=$(NONEXISTENT) \ --bindir=$(NONEXISTENT) \ --libdir=$(NONEXISTENT) \ @@ -52,18 +52,20 @@ INSTALL_CONFIGURE_FLAGS = \ --datadir=$(NONEXISTENT) \ --docdir=$(NONEXISTENT) \ --haddockdir=$(NONEXISTENT) \ - --htmldir=$(NONEXISTENT) \ + --htmldir=$(NONEXISTENT) + +INPLACE_DIRS_CONFIGURE_FLAGS = \ + --prefix=`$(TOP)/utils/pwd/pwd forwardslash`/install-inplace + +USE_STAGE1_CONFIGURE_FLAGS = \ --with-compiler=$(FPTOOLS_TOP_ABS)/compiler/stage1/ghc-inplace \ --with-hc-pkg=$(FPTOOLS_TOP_ABS)/utils/ghc-pkg/ghc-pkg-inplace \ - --with-hsc2hs=$(HSC2HS_INPLACE) \ - $(COMMON_CONFIGURE_FLAGS) + --with-hsc2hs=$(HSC2HS_INPLACE) -INPLACE_CONFIGURE_FLAGS = \ - --prefix=`$(TOP)/utils/pwd/pwd forwardslash`/install-inplace \ +USE_BOOT_CONFIGURE_FLAGS = \ --with-compiler=$(GHC) \ --with-hc-pkg=$(GHC_PKG) \ - --package-db $(FPTOOLS_TOP_ABS)/libraries/bootstrapping.conf \ - $(COMMON_CONFIGURE_FLAGS) + --package-db $(FPTOOLS_TOP_ABS)/libraries/bootstrapping.conf # XXX # --bindir='$$prefix/bin' \ diff --git a/utils/hsc2hs/Makefile b/utils/hsc2hs/Makefile index 297177995e..b26562b352 100644 --- a/utils/hsc2hs/Makefile +++ b/utils/hsc2hs/Makefile @@ -14,14 +14,20 @@ INSTALL_FLAGS = --enable-shell-wrappers endif boot: - $(CABAL) configure --distpref dist-inplace $(INPLACE_CONFIGURE_FLAGS) + $(CABAL) configure --distpref dist-inplace \ + $(INPLACE_DIRS_CONFIGURE_FLAGS) \ + $(USE_BOOT_CONFIGURE_FLAGS) \ + $(COMMON_CONFIGURE_FLAGS) $(CABAL) build --distpref dist-inplace $(BUILD_FLAGS) $(CABAL) install --distpref dist-inplace $(INSTALL_FLAGS) ifneq "$(NO_INSTALL_HSC2HS)" "YES" # XXX #all: -# $(CABAL) configure --distpref dist-install $(INSTALL_CONFIGURE_FLAGS) +# $(CABAL) configure --distpref dist-install \ +# $(INPLACE_DIRS_CONFIGURE_FLAGS) \ +# $(USE_STAGE1_CONFIGURE_FLAGS) \ +# $(COMMON_CONFIGURE_FLAGS) # $(CABAL) build --distpref dist-install $(BUILD_FLAGS) endif |