Commit 145c696c authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Define CABAL in mk/cabal-flags.mk, rather than everywhere we use it

parent cc4da37a
......@@ -154,7 +154,6 @@ subdirs:
HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries
IFBUILDABLE=ifBuildable/ifBuildable $(HERE_ABS)/boot-packages
CABAL=$(HERE_ABS)/cabal-bin $(GHC) $(HERE_ABS)/bootstrapping.conf
CABAL_GHC_FLAGS = -Wall
ifeq "$(ghc_ge_605)" "NO"
......
......@@ -2,6 +2,9 @@
nothing=
space=$(nothing) $(nothing)
LIBRARIES_ABS = $(FPTOOLS_TOP_ABS)/libraries
CABAL = $(LIBRARIES_ABS)/cabal-bin $(GHC) $(LIBRARIES_ABS)/bootstrapping.conf
# We rely on all the CONFIGURE_ARGS being quoted with '...', and there
# being no 's inside the values.
FLAGGED_CONFIGURE_ARGS = $(subst $(space)',\
......
......@@ -7,9 +7,6 @@ include $(TOP)/mk/cabal-flags.mk
# that are not -Wall clean!
# SRC_HC_OPTS += -Wall
CABAL = $(FPTOOLS_TOP_ABS)/libraries/cabal-bin \
$(GHC) $(FPTOOLS_TOP_ABS)/libraries/bootstrapping.conf
ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
INSTALL_FLAGS =
else
......
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