X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile.local;h=84b90a65639cc4f296dfbe734080ef5fc96f58d7;hb=b187c221cc97679e28118ae8ac2997d6a686ba14;hp=fe267de46a8d53308bf3b6681b187d941878a033;hpb=24579536ce57286707e1aaa405994b6638058eed;p=ghc-hetmet.git

diff --git a/libraries/Makefile.local b/libraries/Makefile.local
index fe267de..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)
@@ -23,7 +23,7 @@ GhcLibHcOpts += -Wall
 # now at least we just disable them completely.
 GhcLibHcOpts += -fno-warn-deprecated-flags
 
-ifeq "$(filter-out array-% base-% bytestring-% Cabal-% directory-% editline-% filepath-% ghc-prim-% haskell98-% hpc-% integer-gmp-% old-locale-% old-time-% packedstring-% pretty-% process-% random-% template-haskell-% unix-% Win32-%,$(package))" ""
+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.
@@ -31,8 +31,8 @@ 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
+