Commit 2a150d4b authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Split up Cabal configure flag variables for more flexibility

parent 28a5c73a
......@@ -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)
......
......@@ -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' \
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment