From 8e46d07314ebd87e35a195b1d88b836ccd10346b Mon Sep 17 00:00:00 2001 From: jperkin Date: Fri, 14 Jun 2013 08:53:26 +0000 Subject: When using USE_PKGSRC_GCC_RUNTIME, do not add an rpath for the main GCC libs. --- lang/gcc47-libs/buildlink3.mk | 4 ++-- lang/gcc48-libs/buildlink3.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lang') 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} -- cgit v1.2.3