diff options
| -rw-r--r-- | ghc/lib/std/Makefile | 4 | ||||
| -rw-r--r-- | mk/paths.mk | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile index 8187ebce4b..0857f53dd3 100644 --- a/ghc/lib/std/Makefile +++ b/ghc/lib/std/Makefile @@ -37,6 +37,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)) @@ -82,7 +84,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)) \ diff --git a/mk/paths.mk b/mk/paths.mk index 9010e4795d..83a76b8a6d 100644 --- a/mk/paths.mk +++ b/mk/paths.mk @@ -99,7 +99,7 @@ INSTALL_DIR = $(FPTOOLS_TOP)/glafp-utils/mkdirhier/mkdirhier SRCS=$(wildcard *.lhs *.hs *.c *.lc *.prl *.lprl *.lit *.verb) -HS_SRCS=$(filter %.lhs %.hs %.hc,$(SRCS) $(BOOT_SRCS)) +HS_SRCS=$(filter %.lhs %.hs %.hc,$(sort $(SRCS) $(BOOT_SRCS))) HS_OBJS=$(addsuffix .$(way_)o,$(basename $(HS_SRCS))) HS_HCS=$(addsuffix .$(way_)hc,$(basename $(HS_SRCS))) HS_SS=$(addsuffix .$(way_)s,$(basename $(HS_SRCS))) |