Get building GHC itself with Cabal more-or-less working

[ghc-hetmet.git] / libraries / Makefile.local

diff --git a/libraries/Makefile.local b/libraries/Makefile.local
index f5ac210..7ca6115 100644 (file)
--- a/libraries/Makefile.local
+++ b/libraries/Makefile.local
@@ -1,19 +1,35 @@
 # Local GHC-build-tree customization for Cabal makefiles.  We want to build
-# libraries using flags that the user has put in build.mk.
+# libraries using flags that the user has put in build.mk/validate.mk and
+# appropriate flags for Mac OS X deployment targets.
 
 # Careful here: including boilerplate.mk breaks things, because paths.mk and
 # opts.mk overrides some of the variable settings in the Cabal Makefile, so
-# we just include config.mk and build.mk.
+# we just include config.mk and custom-settings.mk.
 TOP=../..
 SAVE_GHC := $(GHC)
 SAVE_AR  := $(AR)
 SAVE_LD  := $(LD)
 include $(TOP)/mk/config.mk
--include $(TOP)/mk/build.mk
+include $(TOP)/mk/custom-settings.mk
 GHC := $(SAVE_GHC)
 AR  := $(SAVE_AR)
 LD  := $(SAVE_LD)
 
+# We want all warnings on
+GhcLibHcOpts += -Wall
+
+# Cabal has problems with deprecated flag warnings, as it needs to pass
+# deprecated flags in pragmas in order to support older GHCs. Thus for
+# now at least we just disable them completely.
+GhcLibHcOpts += -fno-warn-deprecated-flags
+
+ifeq "$(filter-out base-% unix-% Win32-%,$(package))" ""
+# XXX We are one of the above list, i.e. we are a package that is not
+# yet warning-clean. Thus turn warnings off for now so that validate
+# goes through.
+GhcLibHcOpts += -w
+endif
+
 # Now add flags from the GHC build system to the Cabal build:
-GHC_OPTS += $(SRC_HC_OPTS)
-GHC_OPTS += $(GhcLibHcOpts)
+GHC_OPTS    += $(SRC_HC_OPTS)
+GHC_OPTS    += $(GhcLibHcOpts)