diff options
| author | jperkin <jperkin@pkgsrc.org> | 2013-06-13 10:39:43 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2013-06-13 10:39:43 +0000 |
| commit | 03e53fff6fc2eda672b6d89316c6216e272943a5 (patch) | |
| tree | 18a137361a659aae07ad54a9c06855abe894a608 /lang/gcc47-libs | |
| parent | 5b1601e0716cd065520a0e851a4cbba4bd3e7500 (diff) | |
| download | pkgsrc-03e53fff6fc2eda672b6d89316c6216e272943a5.tar.gz | |
Don't override gcc variables, use ones specific to gcc-libs.
Avoids issue with USE_PKGSRC_GCC_RUNTIME where the gcc48 package would
end up installing to gcc47's prefix.
Diffstat (limited to 'lang/gcc47-libs')
| -rw-r--r-- | lang/gcc47-libs/buildlink3.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lang/gcc47-libs/buildlink3.mk b/lang/gcc47-libs/buildlink3.mk index dbb94c14fea..410871a59b6 100644 --- a/lang/gcc47-libs/buildlink3.mk +++ b/lang/gcc47-libs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2013/03/01 15:06:09 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2013/06/13 10:39:43 jperkin Exp $ BUILDLINK_TREE+= gcc47-libs @@ -23,14 +23,14 @@ BUILDLINK_AUTO_VARS.gcc47-libs= no SPECS_LIBGCC= ${WRAPPER_DIR}/specs.libgcc WRAPPER_TARGETS+= ${SPECS_LIBGCC} -GCC_SUBPREFIX= gcc47 -GCC_PREFIX= ${BUILDLINK_PREFIX.gcc47-libs}/${GCC_SUBPREFIX} -GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM} +LIBGCC_SUBPREFIX= gcc47 +LIBGCC_PREFIX= ${BUILDLINK_PREFIX.gcc47-libs}/${LIBGCC_SUBPREFIX} +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)${GCC_PREFIX}/${GCC_TARGET_MACHINE}/lib/%M $(LINKER_RPATH_FLAG)${GCC_PREFIX}/lib/%M" >>${SPECS_LIBGCC} + @${ECHO} "%D $(LINKER_RPATH_FLAG)${LIBGCC_PREFIX}/${LIBGCC_TARGET_MACHINE}/lib/%M $(LINKER_RPATH_FLAG)${LIBGCC_PREFIX}/lib/%M" >>${SPECS_LIBGCC} _WRAP_EXTRA_ARGS.CC+= -specs ${SPECS_LIBGCC} _WRAP_EXTRA_ARGS.CXX+= -specs ${SPECS_LIBGCC} |