X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile.local;h=0d63f65f9bf4d52370ba31e36acb9a082ce9c138;hp=f5ac210a3356bc7081593257cb9c5ada2fd93df6;hb=3b2d01616bcc71998b0fed5aec06b272d49037ec;hpb=5ee5a583dff1152f137318787dc4d2a8ce91b926

diff --git a/libraries/Makefile.local b/libraries/Makefile.local
index f5ac210..0d63f65 100644
--- a/libraries/Makefile.local
+++ b/libraries/Makefile.local
@@ -1,19 +1,38 @@
 # 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 array-% base-% editline-% filepath-% ghc-prim-% hpc-% pretty-% 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_CC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
+GHC_OPTS    += $(SRC_HC_OPTS)
+GHC_OPTS    += $(GhcLibHcOpts)
+GHC_OPTS    += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
+LIB_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))