summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorjperkin <jperkin>2013-06-14 08:53:26 +0000
committerjperkin <jperkin>2013-06-14 08:53:26 +0000
commit1dd91738891cb0418b0c5025dfa93cedf713ae9c (patch)
treedb1efd927c8bea5648f8630599b8f71209373189 /lang
parenta460705ff29c42ef6dbdcfed3ab598b9077b69c7 (diff)
downloadpkgsrc-1dd91738891cb0418b0c5025dfa93cedf713ae9c.tar.gz
When using USE_PKGSRC_GCC_RUNTIME, do not add an rpath for the main GCC libs.
Diffstat (limited to 'lang')
-rw-r--r--lang/gcc47-libs/buildlink3.mk4
-rw-r--r--lang/gcc48-libs/buildlink3.mk4
2 files changed, 4 insertions, 4 deletions
diff --git a/lang/gcc47-libs/buildlink3.mk b/lang/gcc47-libs/buildlink3.mk
index 410871a59b6..ecfdff7ba6a 100644
--- a/lang/gcc47-libs/buildlink3.mk
+++ b/lang/gcc47-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2013/06/13 10:39:43 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2013/06/14 08:53:26 jperkin Exp $
BUILDLINK_TREE+= gcc47-libs
@@ -30,7 +30,7 @@ LIBGCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM}
# XXX: Using %M requires patched version of gcc (e.g. lang/gcc47)
${SPECS_LIBGCC}:
@${ECHO} "*link_libgcc:" >${SPECS_LIBGCC}
- @${ECHO} "%D $(LINKER_RPATH_FLAG)${LIBGCC_PREFIX}/${LIBGCC_TARGET_MACHINE}/lib/%M $(LINKER_RPATH_FLAG)${LIBGCC_PREFIX}/lib/%M" >>${SPECS_LIBGCC}
+ @${ECHO} "%D $(LINKER_RPATH_FLAG)${LIBGCC_PREFIX}/${LIBGCC_TARGET_MACHINE}/lib/%M" >>${SPECS_LIBGCC}
_WRAP_EXTRA_ARGS.CC+= -specs ${SPECS_LIBGCC}
_WRAP_EXTRA_ARGS.CXX+= -specs ${SPECS_LIBGCC}
diff --git a/lang/gcc48-libs/buildlink3.mk b/lang/gcc48-libs/buildlink3.mk
index ab91777f891..e34c3682376 100644
--- a/lang/gcc48-libs/buildlink3.mk
+++ b/lang/gcc48-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2013/06/13 10:39:43 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2013/06/14 08:53:26 jperkin Exp $
BUILDLINK_TREE+= gcc48-libs
@@ -30,7 +30,7 @@ LIBGCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM}
# XXX: Using %M requires patched version of gcc (e.g. lang/gcc48)
${SPECS_LIBGCC}:
@${ECHO} "*link_libgcc:" >${SPECS_LIBGCC}
- @${ECHO} "%D $(LINKER_RPATH_FLAG)${LIBGCC_PREFIX}/${LIBGCC_TARGET_MACHINE}/lib/%M $(LINKER_RPATH_FLAG)${LIBGCC_PREFIX}/lib/%M" >>${SPECS_LIBGCC}
+ @${ECHO} "%D $(LINKER_RPATH_FLAG)${LIBGCC_PREFIX}/${LIBGCC_TARGET_MACHINE}/lib/%M" >>${SPECS_LIBGCC}
_WRAP_EXTRA_ARGS.CC+= -specs ${SPECS_LIBGCC}
_WRAP_EXTRA_ARGS.CXX+= -specs ${SPECS_LIBGCC}