From 960cb4561ef4b1d976afea21293e294991dbeb6f Mon Sep 17 00:00:00 2001 From: simonmar Date: Thu, 15 Sep 2005 08:56:31 +0000 Subject: [PATCH] [project @ 2005-09-15 08:56:31 by simonmar] Fix previous hack to avoid non-standard sed options --- ghc/compiler/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index ebc19d1..51ec6e8 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -808,12 +808,11 @@ depend :: $(STAGE_PLATFORM_H) $(HS_SRCS) $(C_SRCS) ifneq "$(BootingFromHc)" "YES" $(MKDEPENDHS) -M -optdep-f -optdep.depend-BASE $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-osuf $(obj)) $(MKDEPENDHS_OPTS) $(filter-out -split-objs, $(MKDEPENDHS_HC_OPTS)) $(HS_SRCS) endif - $(SED) -i -e 's:^.*/lib/compat.*$$::' .depend-BASE $(MKDEPENDC) -f .depend-BASE $(MKDEPENDC_OPTS) $(foreach way,$(WAYS),-s $(way)) -- $(CC_OPTS) -- $(C_SRCS) - $(PERL) -pe 'binmode(stdin); binmode(stdout); s@^(\S*\.o)@stage$(stage)/$$1@g; s@(\S*\.hi)@stage$(stage)/$$1@g' <.depend-BASE >.depend-$(stage) + $(PERL) -pe 'binmode(stdin); binmode(stdout); s@^(\S*\.o)@stage$(stage)/$$1@g; s@(\S*\.hi)@stage$(stage)/$$1@g; s@^.*/lib/compat.*$@@g;' <.depend-BASE >.depend-$(stage) # The binmode stuff tells perl not to add stupid ^M's to the output - -# The $(SED) command above is a workaround for a bug in the +# +# The /lib/compat replacement is to workaround a bug in the # -optdep--exclude-module flag in GHC 6.4. It is not required for any # other version of GHC, but doesn't do any harm. -- 1.7.10.4