diff options
| author | jperkin <jperkin@pkgsrc.org> | 2015-04-02 23:42:15 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2015-04-02 23:42:15 +0000 |
| commit | 8d0af3636fd4153abf3dbcc1285d6b6875ae08d6 (patch) | |
| tree | 68fc63d5735fc155bd9b252e0a7e8295f1323620 /mk | |
| parent | 2aa00214da8f09931f71a2a2b6a42329ec50aeeb (diff) | |
| download | pkgsrc-8d0af3636fd4153abf3dbcc1285d6b6875ae08d6.tar.gz | |
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 (limited to 'mk')
| -rw-r--r-- | mk/compiler/gcc.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk index ca7d614d9f9..57b157da5f2 100644 --- a/mk/compiler/gcc.mk +++ b/mk/compiler/gcc.mk @@ -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_PREFIX:= ${_GCC_ARCHDIR:H:H:H:H:H}/ _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_} |