From 8d41379934e85cc3c1b2ac91e3ec6f3106517c89 Mon Sep 17 00:00:00 2001 From: simonmar Date: Wed, 28 Jan 2004 10:27:26 +0000 Subject: [PATCH] [project @ 2004-01-28 10:27:26 by simonmar] Build $(HS_PROG) from $(OBJS), not $(HS_OBJS). In general a Haskell program might have C bits too, and we don't want to have to hack this into the Makefile each time. --- mk/target.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mk/target.mk b/mk/target.mk index 338c8cf..911c21d 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -234,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 -- 1.7.10.4