From 68d6ef34ba383056ea40272fc223f848d76aba77 Mon Sep 17 00:00:00 2001 From: Simon Schubert Date: Thu, 9 Aug 2007 22:50:37 +0000 Subject: [PATCH] Remove NO_GCC41 make option. --- Makefile.inc1 | 6 +----- etc/defaults/make.conf | 3 +-- gnu/lib/Makefile | 5 +---- gnu/usr.bin/Makefile | 4 +--- share/man/man5/make.conf.5 | 5 +---- 5 files changed, 5 insertions(+), 18 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 053a1ade13..5a5ca45d7f 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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.105 2007/08/09 22:39:20 corecode Exp $ +# $DragonFly: src/Makefile.inc1,v 1.106 2007/08/09 22:50:37 corecode Exp $ # # Build-time options are documented in make.conf(5). # @@ -812,10 +812,8 @@ _share= share/syscons/scrnmaps _gcc34_cross= gnu/usr.bin/cc34 _gcc34_tools= gnu/usr.bin/cc34/cc_prep gnu/usr.bin/cc34/cc_tools -.if !defined(NO_GCC41) _gcc41_cross= gnu/usr.bin/cc41 _gcc41_tools= gnu/usr.bin/cc41/cc_prep gnu/usr.bin/cc41/cc_tools -.endif _binutils= gnu/usr.bin/binutils217 .if !defined(NO_FORTRAN) @@ -879,11 +877,9 @@ libraries: cd ${.CURDIR}; \ HOST_CCVER=${HOST_CCVER} CCVER=gcc34 \ ${MAKE} -f Makefile.inc1 _startup_libs34; -.if !defined(NO_GCC41) cd ${.CURDIR}; \ HOST_CCVER=${HOST_CCVER} CCVER=gcc41 \ ${MAKE} -f Makefile.inc1 _startup_libs41; -.endif cd ${.CURDIR}; \ ${MAKE} -f Makefile.inc1 _startup_libs; \ ${MAKE} -f Makefile.inc1 _prebuild_libs; \ diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf index 47e0cd8fd9..7579dfca64 100644 --- a/etc/defaults/make.conf +++ b/etc/defaults/make.conf @@ -1,5 +1,5 @@ # $FreeBSD: src/etc/defaults/make.conf,v 1.97.2.80 2003/02/15 16:34:56 trhodes Exp $ -# $DragonFly: src/etc/defaults/make.conf,v 1.28 2007/03/22 23:31:22 swildner Exp $ +# $DragonFly: src/etc/defaults/make.conf,v 1.29 2007/08/09 22:50:37 corecode Exp $ # # NOTE: Please would any committer updating this file also update the # make.conf(5) manual page, if necessary, which is located in @@ -99,7 +99,6 @@ BDECFLAGS= -W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \ #NO_FORTRAN= true # do not build g77 and related libraries #NO_GAMES= true # do not enter the games subdirectory #NO_GDB= true # do not build GDB -#NO_GCC41= true # do not build gcc-4.1 #NO_I4B= true # do not build isdn4bsd package #NO_IPFILTER= true # do not build IP Filter package #NO_LIBC_R= true # do not build libc_r (re-entrant version of libc) diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index 33811fde0d..d0a2afd09a 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -1,10 +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.14 2007/02/18 23:46:10 corecode Exp $ +# $DragonFly: src/gnu/lib/Makefile,v 1.15 2007/08/09 22:50:37 corecode Exp $ SUBDIR= libdialog libregex libreadline gcc34 - -.if !defined(NO_GCC41) SUBDIR+= gcc41 -.endif .include diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index b101b0f9fa..d995bcdd0c 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -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.30 2007/08/09 22:39:20 corecode Exp $ +# $DragonFly: src/gnu/usr.bin/Makefile,v 1.31 2007/08/09 22:50:37 corecode Exp $ SUBDIR= cpio dialog diff diff3 grep groff man rcs sdiff sort texinfo @@ -15,9 +15,7 @@ SUBDIR+= binutils217 SUBDIR+= cc34 .ORDER: binutils217 cc34 -.if !defined(NO_GCC41) SUBDIR+= cc41 .ORDER: binutils217 cc41 -.endif .include diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index d1a8b1e400..4315986cdb 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.12.2.30 2003/05/18 17:05:55 brueffer Exp $ -.\" $DragonFly: src/share/man/man5/make.conf.5,v 1.26 2007/03/22 23:31:22 swildner Exp $ +.\" $DragonFly: src/share/man/man5/make.conf.5,v 1.27 2007/08/09 22:50:37 corecode Exp $ .\" .Dd March 23, 2007 .Dt MAKE.CONF 5 @@ -384,9 +384,6 @@ and related libraries. .It Va NO_GAMES .Pq Vt bool Set to not build games. -.It Va NO_GCC41 -.Pq Vt bool -Set to not build the upcoming version of GCC (4.1). .It Va NO_GDB .Pq Vt bool Set to not build -- 2.11.4.GIT