X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile.local;h=e3e1e8f2fb22e8f9284302c103c6eead356b1731;hb=2a4d586c8abefa2b0d2a782c421697fd6cf0c964;hp=f5ac210a3356bc7081593257cb9c5ada2fd93df6;hpb=5ee5a583dff1152f137318787dc4d2a8ce91b926;p=ghc-hetmet.git diff --git a/libraries/Makefile.local b/libraries/Makefile.local index f5ac210..e3e1e8f 100644 --- a/libraries/Makefile.local +++ b/libraries/Makefile.local @@ -1,15 +1,15 @@ # 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. # 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)