From: rrt <unknown>
Date: Thu, 16 Mar 2000 16:22:15 +0000 (+0000)
Subject: [project @ 2000-03-16 16:22:15 by rrt]
X-Git-Tag: Approximately_9120_patches~4967
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=6e292d7b67769d55ecf45dfbed606a5249e67d57;p=ghc-hetmet.git

[project @ 2000-03-16 16:22:15 by rrt]
Got rid of an odir problem when building PrelMain as a DLL.
---

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index e01d7c2..7ec2d63 100644
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -109,12 +109,15 @@ CLEAN_FILES += PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
 # 
 # So, we copy out PrelMain.lhs to ".." and build it there &
 # copy the gen'ed object file back in again.
+#
+# Note the patsubst hack (see fptools/mk/target.mk and search for
+# odir for details)
 # 
 ifeq "$(way)" "dll"
 PrelMain.dll_o : PrelMain.lhs
 	$(RM) ../PrelMain.lhs
 	$(CP) PrelMain.lhs ../
-	$(MAKE) -C .. PrelMain.dll_o way=dll HC=std/$(GHC_INPLACE) HC_OPTS="$(filter-out -fcompiling-prelude, $(HC_OPTS))"
+	$(MAKE) -C .. PrelMain.dll_o way=dll HC=std/$(GHC_INPLACE) HC_OPTS="$(filter-out -fcompiling-prelude, $(patsubst -odir,,$(HC_OPTS)))"
 	$(MV) ../PrelMain.dll_o .
 	$(RM) ../PrelMain.lhs ../PrelMain.dll_hi
 endif