From 4613ea0161c81a241890383a136232085c9aa145 Mon Sep 17 00:00:00 2001 From: simonmar Date: Tue, 25 Sep 2001 13:00:41 +0000 Subject: [PATCH] [project @ 2001-09-25 13:00:41 by simonmar] Fix the mangle rule since the definition of GHC_MANGLER changed MERGE TO STABLE --- mk/bootstrap.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mk/bootstrap.mk b/mk/bootstrap.mk index 03b4eb1..639951f 100644 --- a/mk/bootstrap.mk +++ b/mk/bootstrap.mk @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: bootstrap.mk,v 1.15 2001/09/23 21:29:35 ken Exp $ +# $Id: bootstrap.mk,v 1.16 2001/09/25 13:00:41 simonmar Exp $ # # Makefile rules for booting from .hc files without a driver. # @@ -142,7 +142,7 @@ else $(CC) -x c $< -o $@ -S -O $(HC_BOOT_CC_OPTS) -I. `echo $(patsubst -monly-%-regs, -DSTOLEN_X86_REGS=%, $(filter -monly-%-regs, $($*_HC_OPTS))) | sed 's/^$$/-DSTOLEN_X86_REGS=4/'` %.s : %.raw_s - $(GHC_MANGLER) $< $@ $(patsubst -monly-%-regs, %, $(filter -monly-%-regs, $($*_HC_OPTS))) + $(FPTOOLS_TOP)/$(GHC_MANGLER_DIR)/$(GHC_MANGLER) $< $@ $(patsubst -monly-%-regs, %, $(filter -monly-%-regs, $($*_HC_OPTS))) %.o : %.s $(CC) -c -o $@ $< -- 1.7.10.4