From: rrt <unknown>
Date: Tue, 28 Mar 2000 11:21:23 +0000 (+0000)
Subject: [project @ 2000-03-28 11:21:23 by rrt]
X-Git-Tag: Approximately_9120_patches~4887
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=fb5ab041d3113115a49b2bd57a256d072b192737;p=ghc-hetmet.git

[project @ 2000-03-28 11:21:23 by rrt]
Used new SplitObjs setting, and removed patsubst hack (no longer needed,
thank goodness).
---

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index 7b481c9..153b9fb 100644
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -109,16 +109,13 @@ 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"
-GhcLibHcOpts = -O
+SplitObjs = NO
 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, $(patsubst -odir,,$(HC_OPTS)))"
+	$(MAKE) -C .. PrelMain.dll_o way=dll HC=std/$(GHC_INPLACE) HC_OPTS="$(filter-out -fcompiling-prelude, $(HC_OPTS))"
 	$(MV) ../PrelMain.dll_o .
 	$(RM) ../PrelMain.lhs ../PrelMain.dll_hi
 endif