X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Ftarget.mk;h=109dbfcedb00b606d0072a2e30621b7f5e31a936;hb=b71578e649e400677614f46a53ed11da7f3c9da2;hp=6f62c021ccb973ac7b44c7e13716ece0a1a3d411;hpb=5caeef10d99ef3b543d3573adf4e6759bf9d5664;p=ghc-hetmet.git

diff --git a/mk/target.mk b/mk/target.mk
index 6f62c02..109dbfc 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -77,13 +77,11 @@ include $(TOP)/mk/suffix.mk
 # Compiler produced files that are targets of the source's imports.
 MKDEPENDHS_OBJ_SUFFICES=o
 
-ifneq "$(STAMP_PKG_CONF)" ""
+ifneq "$(BootingFromHc)" "YES"
 PKGCONF_DEP = $(STAMP_PKG_CONF)
-else
-PKGCONF_DEP =
 endif
 
-depend :: $(MKDEPENDHS_SRCS) $(MKDEPENDC_SRCS) $(STAMP_PKG_CONF)
+depend :: $(MKDEPENDHS_SRCS) $(MKDEPENDC_SRCS) $(PKGCONF_DEP)
 	@$(RM) .depend
 	@touch .depend
 ifneq "$(DOC_SRCS)" ""
@@ -236,12 +234,12 @@ ifneq "$(HS_PROG)" ""
 all :: $(HS_PROG)
 
 ifneq "$(BootingFromHc)" "YES"
-$(HS_PROG) :: $(HS_OBJS)
-	$(HC) -o $@ $(HC_OPTS) $(LD_OPTS) $(HS_OBJS)
+$(HS_PROG) :: $(OBJS)
+	$(HC) -o $@ $(HC_OPTS) $(LD_OPTS) $(OBJS)
 else
 # see bootstrap.mk
-$(HS_PROG) :: $(HS_OBJS)
-	$(CC) -o $@ $(HC_BOOT_CC_OPTS) $(HC_BOOT_LD_OPTS) $(HS_OBJS) $(HC_BOOT_LIBS)
+$(HS_PROG) :: $(OBJS)
+	$(CC) -o $@ $(HC_BOOT_CC_OPTS) $(HC_BOOT_LD_OPTS) $(OBJS) $(HC_BOOT_LIBS)
 endif
 endif
 
@@ -304,7 +302,7 @@ SRC_HC_OPTS += -split-objs
 ifeq "$(ArSupportsInput)" ""
 define BUILD_LIB
 $(RM) $@ $@.tmp
-(echo $(STUBOBJS) $(C_OBJS); $(FIND) $(patsubst %.$(way_)o,%_split,$(HS_OBJS)) -name '*.$(way_)o') -print | xargs $(AR) $@
+(echo $(STUBOBJS) $(C_OBJS) $(GC_C_OBJS); $(FIND) $(patsubst %.$(way_)o,%_split,$(HS_OBJS)) -name '*.$(way_)o' -print) | xargs $(AR) $@
 $(RANLIB) $@
 endef
 else
@@ -312,6 +310,7 @@ define BUILD_LIB
 $(RM) $@ $@.tmp
 echo $(STUBOBJS) > $@.list
 echo $(C_OBJS) >> $@.list
+echo $(GC_C_OBJS) >> $@.list
 $(FIND) $(patsubst %.$(way_)o,%_split,$(HS_OBJS)) -name '*.$(way_)o' -print >> $@.list
 $(AR) $(AR_OPTS) $@ $(ArSupportsInput) $@.list
 $(RM) $@.list
@@ -325,7 +324,7 @@ HC_SPLIT_PRE = \
     $(RM) $@; if [ ! -d $(basename $@)_split ]; then mkdir $(basename $@)_split; else \
     $(FIND) $(basename $@)_split -name '*.$(way_)o' -print | xargs $(RM) __rm_food; fi
 ifeq "$(GhcWithInterpreter)" "YES"
-HC_SPLIT_POST = (cd $(dir $@) && $(LD) -r $(LD_X) -o $(notdir $@) $(basename $(notdir $@))_split/*.$(way_)o)
+HC_SPLIT_POST = (cd $(basename $@)_split && $(LD) -r $(LD_X) -o ../$(notdir $@) *.$(way_)o)
 else
 HC_SPLIT_POST = touch $@
 endif # GhcWithInterpreter == YES
@@ -623,11 +622,11 @@ $(LINK) : $(LINK_TARGET)
 install ::
 	@$(INSTALL_DIR) $(bindir)
 	@if ( $(PERL) -e '$$fn="$(bindir)/$(LINK)"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \
-	   echo "Creating a symbol link from $(LINK_TARGET) to $(LINK) in $(bindir)"; \
+	   echo "Creating a symbolic link from $(LINK_TARGET) to $(LINK) in $(bindir)"; \
 	   $(RM) $(bindir)/$(LINK); \
 	   $(LN_S) $(LINK_TARGET) $(bindir)/$(LINK); \
 	 else \
-	   echo "Creating a symbol link from $(LINK_TARGET) to $(LINK) in $(bindir) failed: \`$(bindir)/$(LINK)' already exists"; \
+	   echo "Creating a symbolic link from $(LINK_TARGET) to $(LINK) in $(bindir) failed: \`$(bindir)/$(LINK)' already exists"; \
 	   echo "Perhaps remove \`$(bindir)/$(LINK)' manually?"; \
 	   exit 1; \
 	 fi;
@@ -796,12 +795,14 @@ install:: $(INSTALL_INCLUDES)
 endif
 
 ifneq "$(INSTALL_DOCS)" ""
+ifneq "$(SGMLDocWays)" ""
 install-docs:: $(INSTALL_DOCS)
 	@$(INSTALL_DIR) $(datadir)	
 	for i in $(INSTALL_DOCS); do \
 		$(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir); \
 	done
 endif
+endif
 
 ifneq "$(INSTALL_SGML_DOC)" ""
 ifneq "$(SGMLDocWays)" ""
@@ -885,7 +886,7 @@ tags TAGS:: $(TAGS_HS_SRCS) $(TAGS_C_SRCS)
 	@$(RM) TAGS
 	@touch TAGS
 ifneq "$(TAGS_HS_SRCS)" ""
-	$(HSTAGS) $(HSTAGS_OPTS) -- $(TAGS_HS_SRCS)
+	$(HSTAGS) $(HSTAGS_OPTS) $(TAGS_HS_SRCS)
 endif
 ifneq "$(TAGS_C_SRCS)" ""
 	etags -a $(TAGS_C_SRCS)