diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-07-17 14:49:06 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-07-17 14:49:06 +0000 |
| commit | 5b9164b417bd96a629adb0998796e2f9d2d5d22f (patch) | |
| tree | 25b93c30b60b0658d8536000d1c53f14cbdfc0ef /mk | |
| parent | bfe71c85014588b15ce390866f40de7b385443d1 (diff) | |
| download | haskell-5b9164b417bd96a629adb0998796e2f9d2d5d22f.tar.gz | |
Remove some duplication
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/cabal-flags.mk | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/mk/cabal-flags.mk b/mk/cabal-flags.mk index d736679de7..c9663aa5ce 100644 --- a/mk/cabal-flags.mk +++ b/mk/cabal-flags.mk @@ -63,25 +63,23 @@ INSTALL_DIRS_CONFIGURE_FLAGS = \ INPLACE_DIRS_CONFIGURE_FLAGS = \ --prefix=`$(TOP)/utils/pwd/pwd forwardslash`/install-inplace -USE_STAGE1_CONFIGURE_FLAGS = \ - --with-compiler=$(GHC_STAGE1) \ - --with-hc-pkg=$(FPTOOLS_TOP_ABS)/utils/ghc-pkg/ghc-pkg-inplace \ - $(addprefix --cc-option=,$(MACOSX_DEPLOYMENT_CC_OPTS)) \ - $(addprefix --ld-option=,$(MACOSX_DEPLOYMENT_LD_OPTS)) - USE_BOOT_CONFIGURE_FLAGS = \ --with-compiler=$(GHC) \ --with-hc-pkg=$(GHC_PKG) \ --package-db $(FPTOOLS_TOP_ABS)/libraries/bootstrapping.conf -# XXX -# --bindir='$$prefix/bin' \ -# --libdir='$$prefix/lib' \ -# --libexecdir='$$prefix/libexec' \ -# --datadir='$$prefix/data' \ -# --docdir='$$prefix/doc' \ -# --haddockdir='$$prefix/haddock' \ -# --htmldir='$$prefix/html' \ +USE_STAGE_CONFIGURE_FLAGS = \ + --with-hc-pkg=$(FPTOOLS_TOP_ABS)/utils/ghc-pkg/ghc-pkg-inplace \ + $(addprefix --cc-option=,$(MACOSX_DEPLOYMENT_CC_OPTS)) \ + $(addprefix --ld-option=,$(MACOSX_DEPLOYMENT_LD_OPTS)) + +USE_STAGE1_CONFIGURE_FLAGS = \ + --with-compiler=$(GHC_STAGE1) \ + $(USE_STAGE_CONFIGURE_FLAGS) + +USE_STAGE2_CONFIGURE_FLAGS = \ + --with-compiler=$(GHC_STAGE2) \ + $(USE_STAGE_CONFIGURE_FLAGS) BUILD_FLAGS = $(addprefix --ghc-option=,$(SRC_HC_OPTS)) |