diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-07-18 18:47:06 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-07-18 18:47:06 +0000 |
| commit | 5c9f239daf46aaa73e12c8b948659fa5cd7e77fb (patch) | |
| tree | 3f64491afb6cffc9be464b6d6c8b372a20da715e | |
| parent | f7478aee130646e7ddc0e857d3462a60b6a46947 (diff) | |
| download | haskell-5c9f239daf46aaa73e12c8b948659fa5cd7e77fb.tar.gz | |
Build system tweaks
| -rw-r--r-- | ghc/Makefile | 3 | ||||
| -rw-r--r-- | mk/cabal-flags.mk | 7 | ||||
| -rw-r--r-- | mk/cabal.mk | 12 | ||||
| -rw-r--r-- | utils/ghc-pkg/Makefile | 1 |
4 files changed, 14 insertions, 9 deletions
diff --git a/ghc/Makefile b/ghc/Makefile index f824e3acef..43e40a4eb6 100644 --- a/ghc/Makefile +++ b/ghc/Makefile @@ -68,7 +68,8 @@ boot.stage.%: $(CABAL) configure --distpref dist-stage$* \ $(INSTALL_DIRS_CONFIGURE_FLAGS) \ $(CONFIGURE_FLAGS_STAGE$*) \ - $(COMMON_CONFIGURE_FLAGS) + $(COMMON_CONFIGURE_FLAGS) \ + --datasubdir=. \ build.stage.%: $(CABAL) build --distpref dist-stage$* $(BUILD_FLAGS) diff --git a/mk/cabal-flags.mk b/mk/cabal-flags.mk index 4483dc63d1..ae6a6c3c49 100644 --- a/mk/cabal-flags.mk +++ b/mk/cabal-flags.mk @@ -56,16 +56,17 @@ INSTALL_DIRS_CONFIGURE_FLAGS = \ --libdir=$(NONEXISTENT) \ --libexecdir=$(NONEXISTENT) \ --datadir=$(NONEXISTENT) \ - --datasubdir=. \ --docdir=$(NONEXISTENT) \ --haddockdir=$(NONEXISTENT) \ --htmldir=$(NONEXISTENT) -INPLACE_DIRS_CONFIGURE_FLAGS = \ - --prefix=`$(FPTOOLS_TOP_ABS)/utils/pwd/pwd forwardslash`/install-inplace \ +INPLACE_GHC_DATADIR_CONFIGURE_FLAGS = \ --datadir=$(FPTOOLS_TOP_ABS)/inplace-datadir \ --datasubdir=. +INPLACE_DIRS_CONFIGURE_FLAGS = \ + --prefix=`$(FPTOOLS_TOP_ABS)/utils/pwd/pwd forwardslash`/install-inplace + USE_BOOT_CONFIGURE_FLAGS = \ --with-compiler=$(GHC) \ --with-hc-pkg=$(GHC_PKG) \ diff --git a/mk/cabal.mk b/mk/cabal.mk index 5e0de0d94d..f8d2b7b091 100644 --- a/mk/cabal.mk +++ b/mk/cabal.mk @@ -20,10 +20,11 @@ endif default all: with-bootstrapping-compiler with-bootstrapping-compiler: - $(CABAL) configure --distpref dist-inplace \ - $(INPLACE_DIRS_CONFIGURE_FLAGS) \ - $(USE_BOOT_CONFIGURE_FLAGS) \ - $(COMMON_CONFIGURE_FLAGS) + $(CABAL) configure --distpref dist-inplace \ + $(INPLACE_DIRS_CONFIGURE_FLAGS) \ + $(USE_BOOT_CONFIGURE_FLAGS) \ + $(COMMON_CONFIGURE_FLAGS) \ + $(EXTRA_INPLACE_CONFIGURE_FLAGS) $(CABAL) build --distpref dist-inplace $(BUILD_FLAGS) $(CABAL) install --distpref dist-inplace $(INSTALL_FLAGS) @@ -31,7 +32,8 @@ with-stage-1: $(CABAL) configure --distpref dist-install \ $(INSTALL_DIRS_CONFIGURE_FLAGS) \ $(USE_STAGE1_CONFIGURE_FLAGS) \ - $(COMMON_CONFIGURE_FLAGS) + $(COMMON_CONFIGURE_FLAGS) \ + $(EXTRA_STAGE1_CONFIGURE_FLAGS) $(CABAL) build --distpref dist-install $(BUILD_FLAGS) install: diff --git a/utils/ghc-pkg/Makefile b/utils/ghc-pkg/Makefile index 61e4893d40..560fa4adcf 100644 --- a/utils/ghc-pkg/Makefile +++ b/utils/ghc-pkg/Makefile @@ -2,6 +2,7 @@ TOP=../.. ENABLE_SHELL_WRAPPERS = YES EXTRA_CLEAN = Version.hs +EXTRA_INPLACE_CONFIGURE_FLAGS = $(INPLACE_GHC_DATADIR_CONFIGURE_FLAGS) include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/cabal.mk |