From: qrczak Date: Wed, 12 Sep 2001 10:22:19 +0000 (+0000) Subject: [project @ 2001-09-12 10:22:19 by qrczak] X-Git-Tag: Approximately_9120_patches~992 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=e4f6c05076a178ba867ed253b45d020faffacb39;p=ghc-hetmet.git [project @ 2001-09-12 10:22:19 by qrczak] Fix creating HSstd.o. --- diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile index d114e11..2b044a4 100644 --- a/ghc/lib/std/Makefile +++ b/ghc/lib/std/Makefile @@ -109,6 +109,8 @@ CLEAN_FILES += PrelGHC.hi-boot PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way) # we don't want PrelMain in the GHCi library. GHCI_LIBOBJS = $(filter-out PrelMain.$(way_)o,$(HS_OBJS)) +# Turn off standard rule which creates HSstd.o from LIBOBJS. +DONT_WANT_STD_GHCI_LIB_RULE=YES ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" # Standard rule @@ -119,9 +121,6 @@ else # Rule for Win32 platform # Keep HSstd.o as a pseudo-target (I think) -# Turn off standard rule which creates HSstd.o from LIBOBJS. -DONT_WANT_STD_GHCI_LIB_RULE=YES - HSstd.o :: $(GHCI_LIBOBJS) ld -r -x -o HSstd1.o $(filter Prel%, $(GHCI_LIBOBJS)) ld -r -x -o HSstd2.o $(filter-out Prel%, $(GHCI_LIBOBJS))