X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile.local;h=84b90a65639cc4f296dfbe734080ef5fc96f58d7;hb=46c673a70fe14fe05d7160b456925b8591b5f779;hp=b263059dbb1320fd1fa13f62ddec56a755a80138;hpb=0f5e104c36b1dc3d8deeec5fef3d65e7b3a1b5ad;p=ghc-hetmet.git

diff --git a/libraries/Makefile.local b/libraries/Makefile.local
index b263059..84b90a6 100644
--- a/libraries/Makefile.local
+++ b/libraries/Makefile.local
@@ -5,7 +5,7 @@
 # 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 custom-settings.mk.
-TOP=../..
+include ../defineTOP.mk
 SAVE_GHC := $(GHC)
 SAVE_AR  := $(AR)
 SAVE_LD  := $(LD)
@@ -15,11 +15,24 @@ 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 Win32-% dph%,$(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_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))
+
+include $(TOP)/mk/bindist.mk
+