[project @ 2003-07-24 15:04:41 by simonmar]

[ghc-hetmet.git] / mk / paths.mk

diff --git a/mk/paths.mk b/mk/paths.mk
index 7641334..0e55c3f 100644 (file)
--- a/mk/paths.mk
+++ b/mk/paths.mk
@@ -193,12 +193,14 @@ HS_IFACES   = $(addsuffix .$(way_)hi,$(basename $(HS_SRCS)))
 GC_C_OBJS   = $(addsuffix _stub_ffi.$(way_)o,$(basename $(filter %.gc,$(SRCS))))
 HSC_C_OBJS  = $(addsuffix _hsc.$(way_)o,$(basename $(filter %.hsc,$(SRCS))))
 
-# Always remove $(EXCLUDED_C_SRCS) from C_SRCS
+ifeq "$(BootingFromHc)" "NO"
+# We don't want to build the _stub.c files ourselves, unless we're
+# bootstrapping from .hc files.
 EXCLUDED_C_SRCS = $(patsubst %.lhs, %_stub.c, $(HS_SRCS)) \
                  $(patsubst %.hs,  %_stub.c, $(HS_SRCS)) \
                  $(patsubst %.gc, %_stub_ffi.c, $(GC_SRCS)) \
                  $(patsubst %.gc, %_stub_ffi.h, $(GC_SRCS))
-
+endif
 
 C_SRCS      = $(filter-out $(EXCLUDED_C_SRCS),$(filter %.c,$(SRCS)))
 C_OBJS      = $(addsuffix .$(way_)o,$(basename $(C_SRCS)))
@@ -208,8 +210,7 @@ C_OBJS      = $(addsuffix .$(way_)o,$(basename $(C_SRCS)))
 SCRIPT_SRCS = $(filter %.lprl,$(SRCS))
 SCRIPT_OBJS = $(addsuffix .prl,$(basename $(SCRIPT_SRCS)))
 
-OBJS        = $(HS_OBJS) $(C_OBJS) $(SCRIPT_OBJS)
-STUBOBJS    = $(GC_C_OBJS) 
+OBJS        = $(HS_OBJS) $(C_OBJS) $(SCRIPT_OBJS) $(GC_C_OBJS) 
 
 # The default is for $(LIBOBJS) to be the same as $(OBJS)
 LIBOBJS            = $(OBJS)
@@ -262,7 +263,7 @@ TAGS_C_SRCS=$(C_SRCS)
 #                        that may require extra tools to create.
 #
 #
-MOSTLY_CLEAN_FILES += $(HS_OBJS) $(C_OBJS) $(HSC_C_OBJS)
+MOSTLY_CLEAN_FILES += $(HS_OBJS) $(C_OBJS) $(HSC_C_OBJS) $(GC_C_OBJS)
 CLEAN_FILES        += $(HS_PROG) $(C_PROG) $(SCRIPT_PROG) $(SCRIPT_LINK) \
                      $(PROG) $(LIBRARY) a.out \
                      $(DERIVED_HSC_SRCS) \