From: sewardj <unknown>
Date: Mon, 11 Jun 2001 16:49:23 +0000 (+0000)
Subject: [project @ 2001-06-11 16:49:23 by sewardj]
X-Git-Tag: Approximately_9120_patches~1775
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=8fa55882eb4712541d8ec0b88eb5818ae5e50141;p=ghc-hetmet.git

[project @ 2001-06-11 16:49:23 by sewardj]
Ensure the boilerplate rule still applies for building HSstd_cbits.o.
---

diff --git a/mk/target.mk b/mk/target.mk
index b8c28a6..7d0a2e8 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -488,11 +488,14 @@ CLEAN_FILES += $(GHCI_LIBRARY)
 
 all :: $(GHCI_LIBRARY)
 
-ifneq "$(HSLIB)" "std"
+ifneq "$(GHCI_LIBRARY)" "HSstd.o"
 # An annoying gotcha is that the Prelude is a bit special,
 # for reasons described in ghc/lib/std/Makefile.
 # So we only put in this standard rule for packages other than std
 # The rule for the Prelude is in ghc/lib/std/Makefile
+# We check for GHCI_LIBRARY being HSstd.o rather than
+# HSLIB being std, because we want to still use the boilerplate rule 
+# for cbits.
 $(GHCI_LIBRARY) :: $(LIBOBJS)
 	ld -r -x -o $@ $(LIBOBJS) $(STUBOBJS)
 endif