From: sof <unknown>
Date: Fri, 9 Aug 2002 21:28:10 +0000 (+0000)
Subject: [project @ 2002-08-09 21:28:09 by sof]
X-Git-Tag: Approx_11550_changesets_converted~1771
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=a0d19e3374e964b4cce326d63e387ddd8a31d401

[project @ 2002-08-09 21:28:09 by sof]
Added GHC_MANGLER_DIR, GHC_SPLIT_DIR + fix .raw_s -> .s bootstrap suffix rule
---

diff --git a/ghc/mk/paths.mk b/ghc/mk/paths.mk
index d5b3dfe..5584e48 100644
--- a/ghc/mk/paths.mk
+++ b/ghc/mk/paths.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: paths.mk,v 1.40 2002/04/01 13:57:10 simonpj Exp $
+# $Id: paths.mk,v 1.41 2002/08/09 21:28:09 sof Exp $
 #
 # ghc project specific make variables
 #
@@ -34,6 +34,9 @@ GHC_UTILS_DIR	 	= $(GHC_TOP)/$(GHC_UTILS_DIR_REL)
 GHC_DRIVER_DIR		= $(GHC_TOP)/$(GHC_DRIVER_DIR_REL)
 GHC_PKG_DIR		= $(GHC_TOP)/$(GHC_PKG_DIR_REL)
 GHC_GENPRIMOP_DIR	= $(GHC_TOP)/$(GHC_GENPRIMOP_DIR_REL)
+GHC_MANGLER_DIR         = $(GHC_TOP)/$(GHC_MANGLER_DIR_REL)
+GHC_SPLIT_DIR           = $(GHC_TOP)/$(GHC_SPLIT_DIR_REL)
+
 
 GHC_LIB_DIR	 	= $(FPTOOLS_TOP)/libraries
 
diff --git a/mk/bootstrap.mk b/mk/bootstrap.mk
index ff9f645..25cee8b 100644
--- a/mk/bootstrap.mk
+++ b/mk/bootstrap.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: bootstrap.mk,v 1.19 2002/05/14 08:25:46 matthewc Exp $
+# $Id: bootstrap.mk,v 1.20 2002/08/09 21:28:10 sof Exp $
 #
 # Makefile rules for booting from .hc files without a driver.
 #
@@ -149,7 +149,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
-	$(FPTOOLS_TOP)/$(GHC_MANGLER_DIR)/$(GHC_MANGLER) $< $@ $(patsubst -monly-%-regs, %, $(filter -monly-%-regs, $($*_HC_OPTS)))
+	$(GHC_MANGLER) $< $@ $(patsubst -monly-%-regs, %, $(filter -monly-%-regs, $($*_HC_OPTS)))
 
 %.o : %.s
 	$(CC) -c -o $@ $<