[pkgsrc/trunk]: pkgsrc/mk/compiler Don't include the main GCC libraries in li...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/96e5ffe58431
branches:  trunk
changeset: 649388:96e5ffe58431
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Apr 02 23:42:15 2015 +0000

description:
Don't include the main GCC libraries in linker paths when using
USE_PKGSRC_GCC_RUNTIME.  Fixes check-shlibs when using the GCC runtime
packages as previously the main libraries were being picked up instead
of the runtime ones we'd asked for.

diffstat:

 mk/compiler/gcc.mk |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r 05f4703ffdb5 -r 96e5ffe58431 mk/compiler/gcc.mk
--- a/mk/compiler/gcc.mk        Thu Apr 02 23:35:50 2015 +0000
+++ b/mk/compiler/gcc.mk        Thu Apr 02 23:42:15 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.156 2015/04/02 23:21:01 jperkin Exp $
+# $NetBSD: gcc.mk,v 1.157 2015/04/02 23:42:15 jperkin Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -670,7 +670,10 @@
 _GCC_SUBPREFIX:=       ${_GCC_ARCHDIR:H:H:H:H:H:T}/
 .    endif
 .  endif
-_GCC_LIBDIRS=  ${_GCC_ARCHDIR} ${_GCC_PREFIX}lib
+_GCC_LIBDIRS=  ${_GCC_ARCHDIR}
+.  if empty(USE_PKGSRC_GCC_RUNTIME:M[Yy][Ee][Ss])
+_GCC_LIBDIRS+= ${_GCC_PREFIX}lib
+.  endif
 _GCC_LDFLAGS=  # empty
 .  for _dir_ in ${_GCC_LIBDIRS:N*not_found*}
 _GCC_LDFLAGS+= -L${_dir_} ${COMPILER_RPATH_FLAG}${_dir_}