projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Follow Cabal changes
[ghc-hetmet.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
73443f6
..
23c0a74
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-67,12
+67,12
@@
include $(TOP)/mk/boilerplate.mk
# We can't 'make boot' in libraries until stage1 is built
ifeq "$(BootingFromHc)" "YES"
# We can't 'make boot' in libraries until stage1 is built
ifeq "$(BootingFromHc)" "YES"
-SUBDIRS_BUILD = gmp includes rts compat compiler docs utils driver
+SUBDIRS_BUILD = gmp libffi includes rts compat compiler docs utils driver
else
else
-SUBDIRS_BUILD = gmp includes compat utils driver docs compiler rts libraries/Cabal/doc
+SUBDIRS_BUILD = gmp libffi includes compat utils driver docs compiler rts libraries/Cabal/doc
endif
endif
-SUBDIRS = gmp includes compat utils driver docs rts libraries compiler libraries/Cabal/doc
+SUBDIRS = gmp libffi includes compat utils driver docs rts libraries compiler libraries/Cabal/doc
# Sanity check that all the boot libraries are in the tree, to catch
# failure to run darcs-all.
# Sanity check that all the boot libraries are in the tree, to catch
# failure to run darcs-all.
@@
-98,7
+98,6
@@
endif
endif
stage1 : $(GCC_LIB_DEP) check-packages
endif
stage1 : $(GCC_LIB_DEP) check-packages
- $(MAKE) -C utils mostlyclean
$(MAKE) -C utils/mkdependC boot
@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
for i in $(SUBDIRS_BUILD); do \
$(MAKE) -C utils/mkdependC boot
@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
for i in $(SUBDIRS_BUILD); do \
@@
-128,14
+127,8
@@
stage1 : $(GCC_LIB_DEP) check-packages
# compiler of all utils that get installed and of all extra support binaries
# includes in binary dists.
stage2 : check-packages
# compiler of all utils that get installed and of all extra support binaries
# includes in binary dists.
stage2 : check-packages
- $(MAKE) -C utils mostlyclean
- $(MAKE) -C utils stage=2
$(MAKE) -C compiler boot stage=2
$(MAKE) -C compiler stage=2
$(MAKE) -C compiler boot stage=2
$(MAKE) -C compiler stage=2
- $(RM) -f libraries/ifBuildable/ifBuildable
- $(MAKE) -C libraries stage=2 ifBuildable/ifBuildable
- $(RM) -f libraries/installPackage/installPackage
- $(MAKE) -C libraries stage=2 installPackage/installPackage
stage3 : check-packages
stage3 : check-packages
@@
-353,7
+346,7
@@
binary-dist::
echo "HaveLibGmp = $(HaveLibGmp)" >> $(VARFILE)
echo "GhcLibsWithUnix = $(GhcLibsWithUnix)" >> $(VARFILE)
echo "GhcWithInterpreter = $(GhcWithInterpreter)" >> $(VARFILE)
echo "HaveLibGmp = $(HaveLibGmp)" >> $(VARFILE)
echo "GhcLibsWithUnix = $(GhcLibsWithUnix)" >> $(VARFILE)
echo "GhcWithInterpreter = $(GhcWithInterpreter)" >> $(VARFILE)
- echo "GhcHasReadline = $(GhcHasReadline)" >> $(VARFILE)
+ echo "GhcHasEditline = $(GhcHasEditline)" >> $(VARFILE)
echo "BootingFromHc = $(BootingFromHc)" >> $(VARFILE)
echo "XMLDocWays = $(XMLDocWays)" >> $(VARFILE)
# We won't actually use xsltproc, but we need to know if it's "" or not
echo "BootingFromHc = $(BootingFromHc)" >> $(VARFILE)
echo "XMLDocWays = $(XMLDocWays)" >> $(VARFILE)
# We won't actually use xsltproc, but we need to know if it's "" or not