projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2004-01-15 18:04:45 by ross]
[ghc-hetmet.git]
/
mk
/
bootstrap.mk
diff --git
a/mk/bootstrap.mk
b/mk/bootstrap.mk
index
69c7411
..
32d1313
100644
(file)
--- a/
mk/bootstrap.mk
+++ b/
mk/bootstrap.mk
@@
-1,5
+1,5
@@
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
-# $Id: bootstrap.mk,v 1.27 2003/09/02 10:23:30 simonmar Exp $
+# $Id: bootstrap.mk,v 1.29 2004/01/15 18:04:45 ross Exp $
#
# Makefile rules for booting from .hc files without a driver.
#
#
# Makefile rules for booting from .hc files without a driver.
#
@@
-96,7
+96,7
@@
HC_BOOT_LD_OPTS = \
ifeq "$(GhcWithInterpreter)" "YES"
HC_BOOT_LD_OPTS += \
ifeq "$(GhcWithInterpreter)" "YES"
HC_BOOT_LD_OPTS += \
- -L$(FPTOOLS_TOP_ABS)/libraries/haskell-src \
+ -L$(FPTOOLS_TOP_ABS)/libraries/template-haskell \
-L$(FPTOOLS_TOP_ABS)/libraries/readline \
-L$(FPTOOLS_TOP_ABS)/libraries/unix \
-L$(FPTOOLS_TOP_ABS)/libraries/unix/cbits
-L$(FPTOOLS_TOP_ABS)/libraries/readline \
-L$(FPTOOLS_TOP_ABS)/libraries/unix \
-L$(FPTOOLS_TOP_ABS)/libraries/unix/cbits
@@
-139,7
+139,7
@@
HC_BOOT_LD_OPTS += \
HC_BOOT_LIBS =
ifeq "$(GhcWithInterpreter)" "YES"
HC_BOOT_LIBS =
ifeq "$(GhcWithInterpreter)" "YES"
-HC_BOOT_LIBS += -lHSreadline -lHShaskell-src -lHSunix -lHSunix_cbits
+HC_BOOT_LIBS += -lHSreadline -lHStemplate-haskell -lHSunix -lHSunix_cbits
endif
HC_BOOT_LIBS += -lHShaskell98 -lHSbase -lHSbase_cbits -lHSrts -lgmp -lm $(EXTRA_HC_BOOT_LIBS)
endif
HC_BOOT_LIBS += -lHShaskell98 -lHSbase -lHSbase_cbits -lHSrts -lgmp -lm $(EXTRA_HC_BOOT_LIBS)