X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile.local;h=84b90a65639cc4f296dfbe734080ef5fc96f58d7;hb=5882c5ff503c5b3b425708621cbc3371cc36e5de;hp=7ca6115db671df0eb2ca1840bba92de04d149717;hpb=9412e62942ebab0599c7fb0b358a9d4869647b67;p=ghc-hetmet.git diff --git a/libraries/Makefile.local b/libraries/Makefile.local index 7ca6115..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 base-% 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. @@ -33,3 +33,6 @@ endif # Now add flags from the GHC build system to the Cabal build: GHC_OPTS += $(SRC_HC_OPTS) GHC_OPTS += $(GhcLibHcOpts) + +include $(TOP)/mk/bindist.mk +