diff options
| author | jlam <jlam@pkgsrc.org> | 2004-05-17 05:33:08 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-05-17 05:33:08 +0000 |
| commit | 6bb0a14e5a3482b97d875045492b1628f7eeff34 (patch) | |
| tree | 32a15fa31297bffe0147149699ac197671c7d8de /mk | |
| parent | ffec0a5c186063eeab6ba79618a2220c05deace3 (diff) | |
| download | pkgsrc-6bb0a14e5a3482b97d875045492b1628f7eeff34.tar.gz | |
Check that MABIFLAG is defined before checking that it's non-empty. This
avoids breakage if MABIFLAG isn't defined.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/compiler/gcc.mk | 6 |
1 files changed, 3 insertions, 3 deletions
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 |