diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-08-28 12:48:14 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-08-28 12:48:14 +0000 |
| commit | 4a73af53332e94ca56a6faed96f8391c14ecfa18 (patch) | |
| tree | 29a312c4d5ec9c04e383a58c8c856905a318fd84 /mk | |
| parent | c35325dd60a671e6e7fcc513fc3ae02586106c4c (diff) | |
| download | haskell-4a73af53332e94ca56a6faed96f8391c14ecfa18.tar.gz | |
Update the build system to handle building and using haddock2
One side-effect of this is that we need to build the install-utils with
stage2 rather than stage1 as we need the ghc package.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/cabal-flags.mk | 4 | ||||
| -rw-r--r-- | mk/cabal.mk | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/mk/cabal-flags.mk b/mk/cabal-flags.mk index b50702d0e5..4144f255d2 100644 --- a/mk/cabal-flags.mk +++ b/mk/cabal-flags.mk @@ -29,10 +29,6 @@ ifneq "$(ALEX)" "" COMMON_CONFIGURE_FLAGS += --with-alex=$(ALEX) endif -ifneq "$(HADDOCK)" "" -COMMON_CONFIGURE_FLAGS += --with-haddock=$(HADDOCK) -endif - ifneq "$(HAPPY)" "" COMMON_CONFIGURE_FLAGS += --with-happy=$(HAPPY) endif diff --git a/mk/cabal.mk b/mk/cabal.mk index 079f8033ca..8c486a982e 100644 --- a/mk/cabal.mk +++ b/mk/cabal.mk @@ -14,14 +14,14 @@ INSTALL_FLAGS = endif endif -# Tell stage1 to make a dynamically-linked binary, but no wrapper. We assume +# Tell stage2 to make a dynamically-linked binary, but no wrapper. We assume # that in an installation the shared libs will be installed somewhere that # the system can find them. ifeq "$(BuildSharedLibs)" "YES" DYN_FLAGS = --ghc-option=-dynamic --ghc-option=-dynload --ghc-option=deploy endif -.PHONY: default all with-bootstrapping-compiler with-stage-1 clean distclean +.PHONY: default all with-bootstrapping-compiler with-stage-2 clean distclean default all: with-bootstrapping-compiler @@ -34,12 +34,12 @@ with-bootstrapping-compiler: $(CABAL) build --distpref dist-inplace $(BUILD_FLAGS) $(CABAL) install --distpref dist-inplace $(INSTALL_FLAGS) -with-stage-1: +with-stage-2: $(CABAL) configure --distpref dist-install \ $(INSTALL_DIRS_CONFIGURE_FLAGS) \ - $(USE_STAGE1_CONFIGURE_FLAGS) \ + $(USE_STAGE2_CONFIGURE_FLAGS) \ $(COMMON_CONFIGURE_FLAGS) \ - $(EXTRA_STAGE1_CONFIGURE_FLAGS) + $(EXTRA_STAGE2_CONFIGURE_FLAGS) $(CABAL) build --distpref dist-install $(DYN_FLAGS) $(BUILD_FLAGS) install: |