From 145c696c44d201e57e33a308142b7f41aac611db Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Thu, 10 Jul 2008 13:49:28 +0000 Subject: [PATCH] Define CABAL in mk/cabal-flags.mk, rather than everywhere we use it --- libraries/Makefile | 1 - mk/cabal-flags.mk | 3 +++ utils/hsc2hs/Makefile | 3 --- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libraries/Makefile b/libraries/Makefile index ed8bb94..65778ee 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -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" diff --git a/mk/cabal-flags.mk b/mk/cabal-flags.mk index 7a9f9f0..9b2ed2a 100644 --- a/mk/cabal-flags.mk +++ b/mk/cabal-flags.mk @@ -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)',\ diff --git a/utils/hsc2hs/Makefile b/utils/hsc2hs/Makefile index 699aa80..2971779 100644 --- a/utils/hsc2hs/Makefile +++ b/utils/hsc2hs/Makefile @@ -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 -- 1.7.10.4