summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1996-09-19 16:36:24 +0000
committerpeter <peter@FreeBSD.org>1996-09-19 16:36:24 +0000
commitb3f9cfa0e28c63f9f7b5b9a812a3bd8e4cad6c23 (patch)
tree22fea59dc0fa516d2fbc6e088c8b291514c6c749
parente9bf0f92ea236fe826b8c92c442f1aa638bb94c7 (diff)
downloadFreeBSD-src-b3f9cfa0e28c63f9f7b5b9a812a3bd8e4cad6c23.zip
FreeBSD-src-b3f9cfa0e28c63f9f7b5b9a812a3bd8e4cad6c23.tar.gz
Hooks to attempt to get 'make world' working with gcc-2.7.2.1. It's
worked for me, but no guarantees yet. Basically, move cc earlier to lib-tools target, before libraries are built. libgcc is built at the same time, so it's special entry is removed from the libraries target. Also, add bison/gperf immediately before cc, since they are needed to build cc and are not present on an earler-than-2.2 system. (libgcc is partly built with the freshly compiled gcc-2.7.2.1, since it uses __attribute__'s that were not present until now) This _should_ be enough to get running from older releases, perhaps as far back as 2.0.5.
-rw-r--r--Makefile14
1 files changed, 8 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 776e9db..ba3374c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
#
-# $Id: Makefile,v 1.100 1996/09/10 04:21:36 jfieber Exp $
+# $Id: Makefile,v 1.101 1996/09/18 18:14:37 jkh Exp $
#
# Make command line options:
# -DCLOBBER will remove /usr/include
@@ -184,7 +184,7 @@ world:
cd ${.CURDIR} && ${MAKE} libraries
@echo
@echo "--------------------------------------------------------------"
- @echo " Rebuilding C compiler, make, symorder, sgmlfmt and zic(8)"
+ @echo " Rebuilding sgml tools, symorder, groff and zic(8)"
@echo "--------------------------------------------------------------"
cd ${.CURDIR} && ${MAKE} build-tools
@echo
@@ -447,6 +447,12 @@ lib-tools:
rm -f /usr/sbin/compile_et
cd ${.CURDIR}/usr.bin/mk_cmds && ${MAKE} depend && \
${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+ cd ${.CURDIR}/gnu/usr.bin/bison && ${MAKE} depend && \
+ ${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+ cd ${.CURDIR}/gnu/usr.bin/gperf && ${MAKE} depend && \
+ ${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+ cd ${.CURDIR}/gnu/usr.bin/cc && ${MAKE} depend && \
+ ${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
#
# libraries - build and install the libraries
@@ -471,8 +477,6 @@ libraries:
.if exists(gnu)
cd ${.CURDIR}/gnu/lib && ${MAKE} depend && \
${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
- cd ${.CURDIR}/gnu/usr.bin/cc/libgcc && ${MAKE} depend && \
- ${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
.endif
.if exists(secure) && !defined(NOCRYPT) && !defined(NOSECURE)
cd ${.CURDIR}/secure/lib && ${MAKE} depend && \
@@ -500,8 +504,6 @@ libraries:
# compile and install.
#
build-tools:
- cd ${.CURDIR}/gnu/usr.bin/cc && ${MAKE} depend && \
- ${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
cd ${.CURDIR}/usr.bin/symorder && ${MAKE} depend && \
${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
cd ${.CURDIR}/usr.bin/sgmls && ${MAKE} depend && \
OpenPOWER on IntegriCloud