summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2007-08-11 17:31:22 +0000
committerjoerg <joerg@pkgsrc.org>2007-08-11 17:31:22 +0000
commitf24acb4a250dd404767be9d48200ad32d43db379 (patch)
tree2f7de868d4330da5f13568c8497a0c29fc66d0d5
parent3d1a0c5f7721439273e030d7f4c68a43e702dc30 (diff)
downloadpkgsrc-f24acb4a250dd404767be9d48200ad32d43db379.tar.gz
When calling gcc to extract the version number, pass down
ALL_ENV as well. This ensures that any locale settings are overridden and the output matches what pkgsrc expects. This should fix some of the strange bootstrap issues seen over time that were seemingly fxied by USE_NATIVE_GCC=yes.
-rw-r--r--mk/compiler/gcc.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk
index 9af346dcfd4..b14736b064c 100644
--- a/mk/compiler/gcc.mk
+++ b/mk/compiler/gcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.91 2007/08/02 18:19:32 joerg Exp $
+# $NetBSD: gcc.mk,v 1.92 2007/08/11 17:31:22 joerg Exp $
#
# This is the compiler definition for the GNU Compiler Collection.
#
@@ -48,7 +48,7 @@ MAKEFLAGS+= _CC=${_CC:Q}
.if !defined(_GCC_VERSION)
_GCC_VERSION_STRING!= \
- ( ${_CC} -v 2>&1 | ${GREP} 'gcc version' ) 2>/dev/null || ${ECHO} 0
+ ( ${SETENV} ${ALL_ENV} ${_CC} -v 2>&1 | ${GREP} 'gcc version' ) 2>/dev/null || ${ECHO} 0
. if !empty(_GCC_VERSION_STRING:Megcs*)
_GCC_VERSION= 2.8.1 # egcs is considered to be gcc-2.8.1.
. elif !empty(_GCC_VERSION_STRING:Mgcc*)