summaryrefslogtreecommitdiff
path: root/ghc/Makefile
diff options
context:
space:
mode:
authorsimonmar <unknown>2001-03-23 16:36:23 +0000
committersimonmar <unknown>2001-03-23 16:36:23 +0000
commit50027272414438955dbc41696541cbd25da55883 (patch)
treef624c5ebb5b1630ad644dc527bb859a6839cc445 /ghc/Makefile
parent4f4e61a3e5c29075acc8d5128fd93e81b4116550 (diff)
downloadhaskell-50027272414438955dbc41696541cbd25da55883.tar.gz
[project @ 2001-03-23 16:36:20 by simonmar]
Changes to support bootstrapping the compiler from .hc files. It's not quite working yet, but it's not far off. - the biggest change is that any injected #includes are now placed in the .hc file at generation time, rather than compilation time. I can't see any reason not to do this - it makes it clear by looking at the .hc file which files are being #included, it means one less temporary file at compilation time, and it means the .hc file is more standalone. - all the gruesomeness is in mk/bootstrap.mk, which handles building .hc files without a ghc driver.
Diffstat (limited to 'ghc/Makefile')
-rw-r--r--ghc/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/ghc/Makefile b/ghc/Makefile
index 68541ab7da..c62f588696 100644
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -1,5 +1,5 @@
#-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.14 2000/11/06 13:14:52 simonmar Exp $
+# $Id: Makefile,v 1.15 2001/03/23 16:36:20 simonmar Exp $
#
TOP=.
@@ -20,10 +20,10 @@ include $(TOP)/mk/boilerplate.mk
# If we're booting from .hc files, swap the order
# we descend into compiler/ and lib/
#
-ifeq "$(GhcWithHscBuiltViaC)" "NO"
-SUBDIRS = includes utils driver docs compiler rts lib
+ifeq "$(BootingFromHc)" "YES"
+SUBDIRS = includes driver rts docs lib compiler
else
-SUBDIRS = includes utils driver rts docs lib compiler
+SUBDIRS = includes utils driver docs compiler rts lib
endif
# Easier to copy