diff options
author | simonmar <unknown> | 2001-09-25 13:00:41 +0000 |
---|---|---|
committer | simonmar <unknown> | 2001-09-25 13:00:41 +0000 |
commit | 4613ea0161c81a241890383a136232085c9aa145 (patch) | |
tree | cbfad928977a433e85b6df5c8b6719e5c0265c41 /mk/bootstrap.mk | |
parent | 096a1b9a9afac39761f515a126797163e46f44e9 (diff) | |
download | haskell-4613ea0161c81a241890383a136232085c9aa145.tar.gz |
[project @ 2001-09-25 13:00:41 by simonmar]
Fix the mangle rule since the definition of GHC_MANGLER changed
MERGE TO STABLE
Diffstat (limited to 'mk/bootstrap.mk')
-rw-r--r-- | mk/bootstrap.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/bootstrap.mk b/mk/bootstrap.mk index 03b4eb1dd8..639951fe08 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 $@ $< |