From 7a1971ede95d7e5d84cc928801a14d7fc67171c3 Mon Sep 17 00:00:00 2001
From: abs <abs@pkgsrc.org>
Date: Wed, 27 Sep 2006 15:46:11 +0000
Subject: Set MAKE_ENV+=SHELL=${CONFIG_SHELL} for all gcc packages. Fixes SHELL
 set to non sh compatible shell in environment. Thanks to Georg Schwarz.

---
 lang/gcc-ssp/Makefile     | 3 ++-
 lang/gcc/Makefile         | 3 ++-
 lang/gcc3-c/Makefile      | 3 +--
 lang/gcc3/Makefile.common | 4 +++-
 lang/gcc34-ada/Makefile   | 3 ++-
 lang/gcc34/Makefile       | 3 ++-
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/lang/gcc-ssp/Makefile b/lang/gcc-ssp/Makefile
index 2da991d87d9..ca1aec9a421 100644
--- a/lang/gcc-ssp/Makefile
+++ b/lang/gcc-ssp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/07/27 18:48:02 jlam Exp $
+# $NetBSD: Makefile,v 1.47 2006/09/27 15:46:11 abs Exp $
 
 DISTNAME=		gcc-2.95.3
 PKGNAME=		gcc-ssp-2.95.3.13
@@ -39,6 +39,7 @@ CONFIGURE_ARGS+=	--enable-shared
 
 USE_TOOLS+=		chmod
 MAKE_ENV+=		ac_cv_prog_chmod=${TOOLS_CHMOD:Q}
+MAKE_ENV+=		SHELL=${CONFIG_SHELL}
 
 CONFIGURE_DIRS=		${WRKDIR}/objdir
 BUILD_DIRS=		${CONFIGURE_DIRS}
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 17d4adb1e48..3a759c58248 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2006/03/20 18:15:38 jlam Exp $
+# $NetBSD: Makefile,v 1.89 2006/09/27 15:46:11 abs Exp $
 
 DISTNAME=		gcc-2.95.3
 PKGREVISION=		7
@@ -28,6 +28,7 @@ CONFIGURE_ARGS+=	--enable-shared
 
 USE_TOOLS+=		chmod
 MAKE_ENV+=		ac_cv_prog_chmod=${TOOLS_CHMOD:Q}
+MAKE_ENV+=		SHELL=${CONFIG_SHELL}
 
 CONFIGURE_DIRS=		${WRKDIR}/objdir
 BUILD_DIRS=		${CONFIGURE_DIRS}
diff --git a/lang/gcc3-c/Makefile b/lang/gcc3-c/Makefile
index 460941b4e9f..29ef5503176 100644
--- a/lang/gcc3-c/Makefile
+++ b/lang/gcc3-c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/09/27 14:20:28 pooka Exp $
+# $NetBSD: Makefile,v 1.18 2006/09/27 15:46:11 abs Exp $
 
 PKGNAME=	gcc3${GCC3_PKGMODIF}-c-${GCC_VERSION}
 PKGREVISION=	1
@@ -15,7 +15,6 @@ PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 MAKE_ENV+=	ALL_GCC=${ALL_GCC:Q}
 MAKE_ENV+=	ALL_GCC_C=${ALL_GCC_C:Q}
 MAKE_ENV+=	ALL_GCC_CCC=${ALL_GCCXX_C:Q}
-MAKE_ENV+=	SHELL=/bin/sh
 
 .include "../../mk/compiler.mk"
 
diff --git a/lang/gcc3/Makefile.common b/lang/gcc3/Makefile.common
index 6033aa2b4d6..6bbc9b5b727 100644
--- a/lang/gcc3/Makefile.common
+++ b/lang/gcc3/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2006/09/23 12:47:58 joerg Exp $
+# $NetBSD: Makefile.common,v 1.24 2006/09/27 15:46:11 abs Exp $
 
 GCC_VERSION=	3.3.5
 DISTNAME=	gcc-${GCC_VERSION}
@@ -37,6 +37,8 @@ MESSAGE_SUBST+=		GCC_PREFIX=${GCC_PREFIX}
 
 BUILDLINK_PASSTHRU_RPATHDIRS+=	${GCC_PREFIX}
 
+MAKE_ENV+=		SHELL=${CONFIG_SHELL}
+
 # These come from $WRKSRC/Makefile.in
 ALL_GCC=	all-gcc
 ALL_GCC_C=	$$(ALL_GCC) all-target-newlib all-target-libgloss
diff --git a/lang/gcc34-ada/Makefile b/lang/gcc34-ada/Makefile
index bf55870a2fa..27a33af4ca7 100644
--- a/lang/gcc34-ada/Makefile
+++ b/lang/gcc34-ada/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/04/13 18:23:34 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/09/27 15:46:11 abs Exp $
 #
 
 DISTNAME=	gcc-${GCC_VERSION}
@@ -54,6 +54,7 @@ CONFIGURE_ARGS+=	--with-gnu-as
 CONFIGURE_ARGS+=	--with-gnu-ld
 .endif
 CONFIGURE_ARGS+=	--enable-shared
+MAKE_ENV+=		SHELL=${CONFIG_SHELL}
 
 # Ada bootstrap compiler section
 # An Ada compiler is required to build the Ada compiler. You
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index ea8d6ea3d13..202178b2aae 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/04/13 18:23:34 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2006/09/27 15:46:11 abs Exp $
 #
 
 DISTNAME=	gcc-${GCC_VERSION}
@@ -84,6 +84,7 @@ CONFIGURE_ARGS+=	--enable-long-long
 CONFIGURE_ARGS+=	--with-local-prefix=${GCC_PREFIX:Q}
 CONFIGURE_ARGS+=	--with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
 MAKE_ENV+=		ICONVPREFIX=${BUILDLINK_PREFIX.iconv}
+MAKE_ENV+=		SHELL=${CONFIG_SHELL}
 
 .if !empty(BUILD_F77:M[Yy][Ee][Ss])
 .include "../../devel/gmp/buildlink3.mk"
-- 
cgit v1.2.3