X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile.local;h=57dbfefa5d7408a2ef636d28da6333740486121a;hp=e3e1e8f2fb22e8f9284302c103c6eead356b1731;hb=5b846fa36eee0f96c4c47128706d0131f8bb4113;hpb=3241a631b29dd076e7c28846463ec8c9a96d19b4 diff --git a/libraries/Makefile.local b/libraries/Makefile.local index e3e1e8f..57dbfef 100644 --- a/libraries/Makefile.local +++ b/libraries/Makefile.local @@ -1,5 +1,6 @@ # Local GHC-build-tree customization for Cabal makefiles. We want to build -# libraries using flags that the user has put in build.mk/validate.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 @@ -15,5 +16,8 @@ AR := $(SAVE_AR) LD := $(SAVE_LD) # 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))