From: rrt <unknown>
Date: Thu, 16 Aug 2001 14:41:40 +0000 (+0000)
Subject: [project @ 2001-08-16 14:41:40 by rrt]
X-Git-Tag: Approximately_9120_patches~1210
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=8b1d1b8b8bfde824a6c1ac83bfbc5c8572fc217c;p=ghc-hetmet.git

[project @ 2001-08-16 14:41:40 by rrt]
Remove spurious duplicate rule for PrelGHC.$(way)hi.

Improve rule for std.vlb, thanks to a fix to mkvlb.

Add -DILX to SRC_HC_OPTS (needed for PrelTopHandler).
---

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index c8b17f0..7f01561 100644
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -172,7 +172,7 @@ ilxcheck:
 
 ifeq "$(ILXized)" "YES"
 
-SRC_HC_OPTS += -optI--assembly-name -optIstd.$(way_)o -optI--module
+SRC_HC_OPTS += -optI--assembly-name -optIstd.$(way_)o -optI--module -DILX
 
 HS_ILX+=PrelGHC.$(way_)o
 PrelGHC.$(way_)o: PrelGHC.ilx.real
@@ -181,9 +181,6 @@ PrelGHC.$(way_)o: PrelGHC.ilx.real
 	$(ILASM) /QUIET /DLL /OUT=$@ $@.il
 #	mv $@.tmp $@
 
-PrelGHC.$(way_)hi: PrelGHC.hi-boot
-	cp $< $@
-
 std.dll: $(HS_OBJS)
 	al -out:$@ $(HS_OBJS)
 
@@ -191,11 +188,7 @@ std.$(way_)mvl: $(HS_IL)
 	((ILVALID_HOME=c:\\devel\\fcom\\src\\ ILVALID_MSCORLIB=mscorlib.vlb $(ILVALID) c:\\devel\\fcom\\src\\bin\\msilxlib$(ilx2il_suffix).vlb $(HS_IL)) 2>&1) | tee $@
 
 std.$(way_)vlb: std.dll
-#	echo "call devcorb2gen fastchecked" > tmp.bat
-	echo "copy c:\\devel\\fcom\\bin\\msilxlib.$(ILX_WAY).dll msilxlib.$(ILX_WAY).dll" > tmp.bat
-	echo "copy c:\\devel\\fcom\\bin\\mkvlb.exe ." >> tmp.bat
-	echo "copy c:\\devel\\fcom\\bin\\mkvlb.pdb ." >> tmp.bat
-	echo ".\\mkvlb.exe -V -o $@.tmp std" >> tmp.bat
+	mkvlb.exe -V -o $@.tmp std
 	cmd /c tmp.bat
 	mv $@.tmp $@