X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Flib%2Fstd%2FMakefile;h=4a7b2c25e3a522b7112ea456b0378fb9cd99291a;hb=50027272414438955dbc41696541cbd25da55883;hp=8187ebce4b787b01247bcfa5882a47702f39470f;hpb=2ac43a29c516fbba15ced9c4480f94cd05dc39d5;p=ghc-hetmet.git

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index 8187ebc..4a7b2c2 100644
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -22,8 +22,7 @@ endif
 # 	Setting the standard variables
 #
 
-HC 	 = $(GHC_INPLACE)
-CC	 = $(GHC_INPLACE)
+HC = $(GHC_INPLACE)
 
 ifneq "$(DLLized)" "YES"
 PACKAGE = -package-name std
@@ -37,6 +36,8 @@ HSLIB = std
 # we don't want PrelMain in the GHCi library.
 GHCI_LIBOBJS = $(filter-out PrelMain.$(way_)o,$(HS_OBJS))
 
+BOOT_SRCS += PrelPrimopWrappers.hs
+
 HSC_SRCS = $(wildcard *.hsc)
 HSC_HS   = $(patsubst %.hsc,%.hs, $(HSC_SRCS))
 HS_SRCS := $(HSC_HS) $(filter-out $(HSC_HS),$(HS_SRCS))
@@ -70,8 +71,12 @@ PrelPrimopWrappers.hs: ../../compiler/prelude/primops.txt
 PrelGHC.$(way_)hi	: PrelGHC.hi-boot
 	cp $< $@
 
-boot :: PrelPrimopWrappers.hs PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
-all :: PrelPrimopWrappers.hs
+boot :: PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
+
+ifneq "$(BootingFromHc)" "YES"
+boot :: PrelPrimopWrappers.hs
+all  :: PrelPrimopWrappers.hs
+endif
 
 DLL_DESCRIPTION="GHC-compiled Haskell Prelude"
 
@@ -82,7 +87,7 @@ HS_SRCS := $(filter-out PrelMain.lhs, $(HS_SRCS))
 all :: PrelMain.dll_o
 endif
 
-CLEAN_FILES += PrelPrimopWrappers.hs PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
+CLEAN_FILES += PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
 
 CLEAN_FILES +=  \
 	$(patsubst %.hsc, %.hs, $(HSC_SRCS)) \