X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Flib%2Fstd%2FMakefile;h=0fdeebca190f5c20899ec6ce51fe6e83708283e0;hb=ec2e177faf6ed8ff934f0bd97cf77fcb0f2210bd;hp=24c9afe199926510778dd4644d5e3f7ac5ef1312;hpb=a49a772808296f7d39c079e0e430e80fe94a89c0;p=ghc-hetmet.git diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile index 24c9afe..0fdeebc 100644 --- a/ghc/lib/std/Makefile +++ b/ghc/lib/std/Makefile @@ -111,21 +111,21 @@ GHCI_LIBOBJS = $(filter-out PrelMain.$(way_)o,$(HS_OBJS)) ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" -# Standard rule -HSstd.o :: $(GHCI_LIBOBJS) - ld -r -x -o $@ $(GHCI_LIBOBJS) - +LIBOBJS=$(GHCI_LIBOBJS) 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)) + @touch HSstd.o endif # TARGETPLATFORM = i386-unknown-mingw32 - - #----------------------------------------------------------------------------- # Installation; need to install .hi files as well as libraries #