Repository : ssh://darcs.haskell.org//srv/darcs/nofib On branch : master
http://hackage.haskell.org/trac/ghc/changeset/8b39ff5abfd766b7579c14095e70703956e853d0 >--------------------------------------------------------------- commit 8b39ff5abfd766b7579c14095e70703956e853d0 Author: Ian Lynagh <[email protected]> Date: Tue May 28 14:08:17 2013 +0100 Remove USE_NEW_MKDEPEND_FLAGS It was always YES anyway >--------------------------------------------------------------- mk/boilerplate.mk | 3 --- mk/ghc-target.mk | 4 ---- 2 files changed, 0 insertions(+), 7 deletions(-) diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk index 929d03d..db40550 100644 --- a/mk/boilerplate.mk +++ b/mk/boilerplate.mk @@ -95,9 +95,6 @@ $(eval $(call ghc-ge,6,13)) RUNTEST = $(NOFIB_TOP)/runstdtest/runstdtest -USE_NEW_MKDEPEND_FLAGS = YES -# USE_NEW_MKDEPEND_FLAGS := $(shell if test `$(MKDEPENDHS) --numeric-version | sed -e "s/\./0/" -e "s/\..*//"` -ge 609; then echo YES; else echo NO; fi) - include $(NOFIB_TOP)/mk/ghc-paths.mk include $(NOFIB_TOP)/mk/ghc-opts.mk include $(NOFIB_TOP)/mk/paths.mk diff --git a/mk/ghc-target.mk b/mk/ghc-target.mk index 16b9258..df5d2d4 100644 --- a/mk/ghc-target.mk +++ b/mk/ghc-target.mk @@ -76,11 +76,7 @@ ifneq "$(BootingFromHc)" "YES" PKGCONF_DEP = $(STAMP_PKG_CONF) endif -ifeq "$(USE_NEW_MKDEPEND_FLAGS)" "YES" MKDEPENDHS_FLAGS = -dep-suffix "" -dep-makefile .depend $(foreach way,$(WAYS),-dep-suffix $(way)) -else -MKDEPENDHS_FLAGS = -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way)) -endif depend :: $(MKDEPENDHS_SRCS) $(PKGCONF_DEP) @$(RM) .depend _______________________________________________ ghc-commits mailing list [email protected] http://www.haskell.org/mailman/listinfo/ghc-commits
