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 9606f94..7ca6115 100644 (file)
--- a/libraries/Makefile.local
+++ b/libraries/Makefile.local
@@ -23,7 +23,7 @@ GhcLibHcOpts += -Wall
 # now at least we just disable them completely.
 GhcLibHcOpts += -fno-warn-deprecated-flags
 
-ifeq "$(filter-out array-% base-% directory-% editline-% filepath-% ghc-prim-% hpc-% integer-gmp-% pretty-% process-% unix-% Win32-%,$(package))" ""
+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.
@@ -31,8 +31,5 @@ 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))