From 41fb12ea87ef4818b43cc80beae1e26e52c4d10f Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Mon, 17 May 2004 05:33:08 +0000
Subject: Check that MABIFLAG is defined before checking that it's non-empty. 
 This avoids breakage if MABIFLAG isn't defined.

---
 mk/compiler/gcc.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'mk/compiler')

diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk
index 7222717ed85..4de0fc453e5 100644
--- a/mk/compiler/gcc.mk
+++ b/mk/compiler/gcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.66 2004/05/17 03:12:46 jschauma Exp $
+# $NetBSD: gcc.mk,v 1.67 2004/05/17 05:33:08 jlam Exp $
 
 .if !defined(COMPILER_GCC_MK)
 COMPILER_GCC_MK=	defined
@@ -271,12 +271,12 @@ _GCC_SUBPREFIX!=	\
 _GCC_PREFIX=		${LOCALBASE}/${_GCC_SUBPREFIX}
 _GCC_ARCHDIR!=		\
 	if [ -x ${_GCC_PREFIX}bin/gcc ]; then				\
-			${DIRNAME} `${_GCC_PREFIX}bin/gcc ${MABIFLAG} --print-libgcc-file-name`; \
+		${DIRNAME} `${_GCC_PREFIX}bin/gcc ${MABIFLAG} -print-libgcc-file-name 2>/dev/null`; \
 	else								\
 		${ECHO} "_GCC_ARCHDIR_not_found";			\
 	fi
 .  if empty(_GCC_ARCHDIR:M*not_found*)
-.    if !empty(MABIFLAG)
+.    if defined(MABIFLAG) && !empty(MABIFLAG)
 _GCC_PREFIX:=		${_GCC_ARCHDIR:H:H:H:H:H}/
 _GCC_SUBPREFIX:=	${_GCC_ARCHDIR:H:H:H:H:H:T}/
 .    else
-- 
cgit v1.2.3