Remove USE_NEW_MKDEPEND_FLAGS
authorIan Lynagh <ian@well-typed.com>
Tue, 28 May 2013 13:08:17 +0000 (14:08 +0100)
committerIan Lynagh <ian@well-typed.com>
Tue, 28 May 2013 13:08:17 +0000 (14:08 +0100)
It was always YES anyway

mk/boilerplate.mk
mk/ghc-target.mk

index 929d03d..db40550 100644 (file)
@@ -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
index 16b9258..df5d2d4 100644 (file)
@@ -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