diff options
| author | sbd <sbd@pkgsrc.org> | 2012-09-13 10:17:14 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2012-09-13 10:17:14 +0000 |
| commit | 33d1c70904d8553066e7cbdc92f71bef0570e17a (patch) | |
| tree | 668f0105f277a7057456507c57cab04427edc3a0 | |
| parent | 634c835ca57280b22c6a945623b2dcfe4ef4260d (diff) | |
| download | pkgsrc-33d1c70904d8553066e7cbdc92f71bef0570e17a.tar.gz | |
Move the setting of _USE_GCC_SHLIB=yes on SunOS from the gcc buildlink3 to
mk/compiler/gcc.mk
| -rw-r--r-- | lang/gcc47/buildlink3.mk | 10 | ||||
| -rw-r--r-- | mk/compiler/gcc.mk | 9 |
2 files changed, 9 insertions, 10 deletions
diff --git a/lang/gcc47/buildlink3.mk b/lang/gcc47/buildlink3.mk index 420bccd14af..200b4f4c0d1 100644 --- a/lang/gcc47/buildlink3.mk +++ b/lang/gcc47/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2012/09/13 10:11:02 sbd Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2012/09/13 10:17:14 sbd Exp $ BUILDLINK_TREE+= gcc47 @@ -17,14 +17,6 @@ BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_PREFIX.gcc47}/gcc47 BUILDLINK_FILES.gcc47= #empty BUILDLINK_AUTO_VARS.gcc47= no -# When not using the GNU linker, gcc will always link shared libraries -# against the shared version of libgcc. Always enable _USE_GCC_SHILB on -# platforms that don't use the GNU linker, such as SunOS. -.include "../../mk/bsd.fast.prefs.mk" -.if ${OPSYS} == "SunOS" -_USE_GCC_SHLIB= yes -.endif - # Packages that link against shared libraries need a full dependency. .if defined(_USE_GCC_SHLIB) DEPENDS+= {gcc47,gcc47-libs}>=${_GCC_REQD}:../../lang/gcc47-libs diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk index 391e252218e..9a6496e7682 100644 --- a/mk/compiler/gcc.mk +++ b/mk/compiler/gcc.mk @@ -1,4 +1,4 @@ -# $NetBSD: gcc.mk,v 1.125 2012/07/27 10:34:00 jperkin Exp $ +# $NetBSD: gcc.mk,v 1.126 2012/09/13 10:17:14 sbd Exp $ # # This is the compiler definition for the GNU Compiler Collection. # @@ -484,6 +484,13 @@ _USE_GCC_SHLIB?= yes . endif .endif +# When not using the GNU linker, gcc will always link shared libraries +# against the shared version of libgcc. Always enable _USE_GCC_SHILB on +# platforms that don't use the GNU linker, such as SunOS. +.if ${OPSYS} == "SunOS" +_USE_GCC_SHLIB= yes +.endif + .if !empty(USE_NATIVE_GCC:M[yY][eE][sS]) && !empty(_IS_BUILTIN_GCC:M[yY][eE][sS]) _USE_PKGSRC_GCC= no .elif !empty(USE_PKGSRC_GCC:M[yY][eE][sS]) |