Commit 8d413799 authored by simonmar's avatar simonmar
Browse files

[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.
parent 41004dd8
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment