diff options
author | Ian Lynagh <igloo@earth.li> | 2008-09-12 11:03:16 +0000 |
---|---|---|
committer | Ian Lynagh <igloo@earth.li> | 2008-09-12 11:03:16 +0000 |
commit | ddd3c15b38580dcdc30fcf90ec0eadf8ae013639 (patch) | |
tree | 9ee81a6e18e92891e5911d3eac7789222fd802e2 /mk | |
parent | 53e789fe6abe0ab72831f28d6df75ddd652276e2 (diff) | |
download | haskell-ddd3c15b38580dcdc30fcf90ec0eadf8ae013639.tar.gz |
If USE_NEW_MKDEPEND_FLAGS is YES then don't use the deprecated -optdep flags
Diffstat (limited to 'mk')
-rw-r--r-- | mk/target.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mk/target.mk b/mk/target.mk index e34948933d..407a293ddc 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -83,6 +83,12 @@ ifneq "$(BootingFromHc)" "YES" PKGCONF_DEP = $(STAMP_PKG_CONF) endif +ifeq "$(USE_NEW_MKDEPEND_FLAGS)" "YES" +MKDEPENDHS_FLAGS = -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) $(MKDEPENDC_SRCS) $(PKGCONF_DEP) @$(RM) .depend @touch .depend @@ -93,7 +99,7 @@ ifneq "$(MKDEPENDC_SRCS)" "" $(MKDEPENDC) -f .depend $(MKDEPENDC_OPTS) $(foreach way,$(WAYS),-s $(way)) -- $(CC_OPTS) -- $(MKDEPENDC_SRCS) endif ifneq "$(MKDEPENDHS_SRCS)" "" - $(MKDEPENDHS) -M -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-osuf $(obj)) $(MKDEPENDHS_OPTS) $(filter-out -split-objs, $(HC_OPTS)) $(MKDEPENDHS_SRCS) + $(MKDEPENDHS) -M $(MKDEPENDHS_FLAGS) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-osuf $(obj)) $(MKDEPENDHS_OPTS) $(filter-out -split-objs, $(HC_OPTS)) $(MKDEPENDHS_SRCS) endif |