summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2008-07-03 00:13:00 +0000
committerIan Lynagh <igloo@earth.li>2008-07-03 00:13:00 +0000
commit79b4f894215ae098c26cfe8fb7bc7f89008e8420 (patch)
treeaf265304f2e5d118b9495bb1b47e97972f09416f /Makefile
parenta8d57b05e71ad859eb0024704b216fe1de9f362a (diff)
downloadhaskell-79b4f894215ae098c26cfe8fb7bc7f89008e8420.tar.gz
Teach cabal-bin how to build Setup programs
We now build a copy of Cabal and put it in a bootstrapping package.conf. We also make boot in libraries much earlier in the build process, so we can use cabal-bin for more stuff in the future.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 23c0a74f90..c4ff13cfca 100644
--- a/Makefile
+++ b/Makefile
@@ -98,6 +98,7 @@ endif
endif
stage1 : $(GCC_LIB_DEP) check-packages
+ $(MAKE) -C libraries boot
$(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 \
@@ -116,7 +117,6 @@ stage1 : $(GCC_LIB_DEP) check-packages
$(MAKE) --no-print-directory -C $$i $(MFLAGS) all; \
if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ; then true; else exit 1; fi; \
done
- $(MAKE) -C libraries boot
$(MAKE) -C libraries all
# When making distributions (i.e., whether with binary-dist or using the