ports/64237: USE_GCC does not always set MAKE_ENV

[Kris Kennaway]

>Number:         64237
>Category:       ports
>Synopsis:       USE_GCC does not always set MAKE_ENV
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 13 19:00:37 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Kris Kennaway
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
FreeBSD
>Environment:
System: FreeBSD xor.obsecurity.org 4.9-STABLE FreeBSD 4.9-STABLE #16: Sun Feb 29 19:15:38 PST 2004 kkenn at xor.obsecurity.org:/usr/src-4.x/sys/compile/XOR i386

>Description:
USE_GCC is inconsistently treated in bsd.port.mk; specifically it
doesn't set MAKE_ENV in all cases, so USE_GCC=3.2 or 3.3 does not work
on 4.x systems.

>How-To-Repeat:

>Fix:

Index: bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.484
diff -u -r1.484 bsd.port.mk
--- bsd.port.mk	4 Feb 2004 04:27:04 -0000	1.484
+++ bsd.port.mk	14 Mar 2004 02:49:50 -0000
@@ -1597,7 +1597,6 @@
 CC=				gcc295
 CXX=			g++295
 BUILD_DEPENDS+=	gcc295:${PORTSDIR}/lang/gcc295
-MAKE_ENV+=		CC=${CC} CXX=${CXX}
 GCCVERSION=		029500
 .endif
 .if defined(USE_GCC) && ${USE_GCC} == 3.1 && ( ${OSVERSION} < 500035 || ${OSVERSION} > 500038 )
@@ -1605,7 +1604,6 @@
 CXX=			g++31
 F77=			g77-31
 BUILD_DEPENDS+=	gcc31:${PORTSDIR}/lang/gcc31
-MAKE_ENV+=		CC=${CC} CXX=${CXX}
 GCCVERSION=		030100
 .endif
 .if defined(USE_GCC) && ${USE_GCC} == 3.2 && ${OSVERSION} < 500039
@@ -1908,7 +1906,7 @@
 
 MAKE_FLAGS?=	-f
 MAKEFILE?=		Makefile
-MAKE_ENV+=		PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" MANPREFIX="${MANPREFIX}"
+MAKE_ENV+=		PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" MANPREFIX="${MANPREFIX}" CC="${CC}" CXX="${CXX}"
 
 .if ${OSVERSION} < 500016
 PTHREAD_CFLAGS?=	-D_THREAD_SAFE


>Release-Note:
>Audit-Trail:
>Unformatted: