Unhook gcc-3.3 from the buildworld process. This also removes the gcc3
authorDavid Rhodus <drhodus@dragonflybsd.org>
Sat, 26 Jun 2004 02:56:48 +0000 (02:56 +0000)
committerDavid Rhodus <drhodus@dragonflybsd.org>
Sat, 26 Jun 2004 02:56:48 +0000 (02:56 +0000)
leftover files when `make upgrade` is run.

Makefile.inc1
etc/Makefile
etc/mtree/BSD.usr.dist
gnu/lib/Makefile
gnu/usr.bin/Makefile

index 0cf546c..5f1fb20 100644 (file)
@@ -1,6 +1,6 @@
 #
 # $FreeBSD: src/Makefile.inc1,v 1.141.2.62 2003/04/06 19:54:00 dwmalone Exp $
-# $DragonFly: src/Makefile.inc1,v 1.34 2004/06/22 21:46:53 dillon Exp $
+# $DragonFly: src/Makefile.inc1,v 1.35 2004/06/26 02:56:47 drhodus Exp $
 #
 # Make command line options:
 #      -DMAKE_KERBEROS5 to build Kerberos5
@@ -734,8 +734,6 @@ _games=     games/adventure games/hack games/phantasia
 _share=        share/syscons/scrnmaps
 .endif
 
-_gcc3_cross= gnu/usr.bin/cc3
-_gcc3_tools= gnu/usr.bin/cc3/cc_tools
 _gcc34_cross= gnu/usr.bin/cc34
 _gcc34_tools= gnu/usr.bin/cc34/cc_prep gnu/usr.bin/cc34/cc_tools
 .if ${MACHINE_ARCH} == "i386" && ${TARGET_ARCH} == "i386"
@@ -769,7 +767,7 @@ _sysinstall= release/sysinstall
 .endif
 
 build-tools:
-.for _tool in ${_gcc2_tools} ${_gcc3_tools} ${_gcc34_tools} \
+.for _tool in ${_gcc2_tools} ${_gcc34_tools} \
              ${_fortran} ${_perl} ${_libroken4} ${_libkrb5} \
              ${_share} ${_sysinstall}
        ${ECHODIR} "===> ${_tool} (build-tools)"; \
@@ -795,7 +793,7 @@ _btxld=     usr.sbin/btxld
 cross-tools:
 .for _tool in ${_btxld} ${_elf2exe} ${_binutils} \
              usr.bin/objformat usr.sbin/crunch/crunchide \
-             ${_gcc2_cross} ${_gcc3_cross} ${_gcc34_cross}
+             ${_gcc2_cross} ${_gcc34_cross}
        ${ECHODIR} "===> ${_tool} (cross-tools)"; \
                cd ${.CURDIR}/${_tool}; \
                ${MAKE} DIRPRFX=${_tool}/ obj; \
@@ -825,8 +823,6 @@ libraries:
        cd ${.CURDIR}; \
            HOST_CCVER=${HOST_CCVER} CCVER=gcc2 \
                ${MAKE} -f Makefile.inc1 _startup_libs2; \
-           HOST_CCVER=${HOST_CCVER} CCVER=gcc3 \
-               ${MAKE} -f Makefile.inc1 _startup_libs3; \
            HOST_CCVER=${HOST_CCVER} CCVER=gcc34 \
                ${MAKE} -f Makefile.inc1 _startup_libs34; \
            ${MAKE} -f Makefile.inc1 _startup_libs; \
@@ -841,7 +837,6 @@ libraries:
 # specifically built using gcc{2,3}.
 #
 _startup_libs2=        gnu/lib/gcc2/libgcc
-_startup_libs3=        gnu/lib/gcc3/libgcc
 _startup_libs34=       gnu/lib/gcc34/libgcc
 .if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf)
 _startup_libs= lib/csu/${MACHINE_ARCH}-elf
index f7fd6b0..167da97 100644 (file)
@@ -1,6 +1,6 @@
 #      from: @(#)Makefile      5.11 (Berkeley) 5/21/91
 # $FreeBSD: src/etc/Makefile,v 1.219.2.38 2003/03/04 09:49:00 ru Exp $
-# $DragonFly: src/etc/Makefile,v 1.22 2004/06/16 01:06:42 dillon Exp $
+# $DragonFly: src/etc/Makefile,v 1.23 2004/06/26 02:56:48 drhodus Exp $
 
 .if !defined(NO_SENDMAIL)
 SUBDIR=        sendmail
@@ -109,6 +109,8 @@ upgrade_etc:
 .endif
 .if exists(${DESTDIR}/usr/libexec/binutils212/elf/as)
        ldconfig -m ${DESTDIR}/usr/lib/gcc2
+       rm -rf ${DESTDIR}/usr/lib/gcc3
+       rm -rf ${DESTDIR}/usr/libexec/gcc3
        rm -rf ${DESTDIR}/usr/libdata/ldscripts
        rm -rf ${DESTDIR}/usr/libdata/gcc2
        rm -rf ${DESTDIR}/usr/libdata/gcc3
index f105823..aa35fdd 100644 (file)
@@ -1,5 +1,5 @@
 # $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.188.2.40 2003/02/14 22:38:14 nectar Exp $
-# $DragonFly: src/etc/mtree/BSD.usr.dist,v 1.13 2004/06/18 21:45:06 drhodus Exp $
+# $DragonFly: src/etc/mtree/BSD.usr.dist,v 1.14 2004/06/26 02:56:48 drhodus Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -17,8 +17,6 @@
     lib
        gcc2
        ..
-       gcc3
-       ..
        gcc34
        ..
         aout
        ..
        gcc2
        ..
-       gcc3
-       ..
        gcc34
        ..
         lpr
index df80b92..256889f 100644 (file)
@@ -1,7 +1,7 @@
 # $FreeBSD: src/gnu/lib/Makefile,v 1.25.2.4 2001/01/06 23:16:53 obrien Exp $
-# $DragonFly: src/gnu/lib/Makefile,v 1.6 2004/06/21 03:48:02 dillon Exp $
+# $DragonFly: src/gnu/lib/Makefile,v 1.7 2004/06/26 02:56:48 drhodus Exp $
 
-SUBDIR= libdialog libgmp libmp libregex libreadline gcc3 gcc34
+SUBDIR= libdialog libgmp libmp libregex libreadline gcc34
 
 .if ${MACHINE_ARCH} == "i386"
 SUBDIR+=gcc2
index 2fbc521..9373d80 100644 (file)
@@ -1,5 +1,5 @@
 # $FreeBSD: src/gnu/usr.bin/Makefile,v 1.51 2000/01/16 00:11:34 obrien Exp $
-# $DragonFly: src/gnu/usr.bin/Makefile,v 1.9 2004/06/21 03:48:04 dillon Exp $
+# $DragonFly: src/gnu/usr.bin/Makefile,v 1.10 2004/06/26 02:56:48 drhodus Exp $
 #
 # Note that gcc2 is only built under the i386 architecture.  Other
 # architectures require gcc3.
@@ -11,8 +11,8 @@ SUBDIR= bc cpio dc dialog diff diff3 gperf grep groff gzip man patch ptx rcs \
 SUBDIR+=cvs
 .endif
 
-SUBDIR+= binutils214 cc3 cc34
-.ORDER: binutils214 cc3 cc34
+SUBDIR+= binutils214 cc34
+.ORDER: binutils214 cc34
 
 .if ${MACHINE_ARCH} == "i386"
 SUBDIR+=binutils cc as ld