diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-12-02 23:42:36 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-12-02 23:42:36 +0100 |
| commit | 5baaebf94e47dacbcdd80890a736ab5139694a08 (patch) | |
| tree | 9f8baf1b48f2ac8b95be937a538c4b5049c7ba0e | |
| parent | sys-devel/gcc: Complete install (hopefully). (diff) | |
| download | mgorny-5baaebf94e47dacbcdd80890a736ab5139694a08.tar.gz mgorny-5baaebf94e47dacbcdd80890a736ab5139694a08.tar.bz2 mgorny-5baaebf94e47dacbcdd80890a736ab5139694a08.zip | |
sys-devel/gcc: Replace old toolchain.eclass variable references.
Package-Manager: portage-2.2.14
| -rw-r--r-- | sys-devel/gcc/gcc-4.9.2-r100.ebuild | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys-devel/gcc/gcc-4.9.2-r100.ebuild b/sys-devel/gcc/gcc-4.9.2-r100.ebuild index 6f6d359..a552b15 100644 --- a/sys-devel/gcc/gcc-4.9.2-r100.ebuild +++ b/sys-devel/gcc/gcc-4.9.2-r100.ebuild @@ -195,7 +195,7 @@ src_configure() { LIBPATH=${PREFIX}/lib/gcc/${CTARGET}/${PV} INCPATH=${LIBPATH}/include DATAPATH=${PREFIX}/share/gcc-data/${CTARGET}/${PV} - STDCXX_INCDIR=${LIBPATH}/include/g++-v${GCC_BRANCH_VER%%.*} + STDCXX_INCDIR=${LIBPATH}/include/g++-v${PV%%.*} local langs=( c ) use cxx && langs+=( c++ ) @@ -469,7 +469,7 @@ create_gcc_symlinks() { strip_gcc_executables() { # TODO: find out how to avoid prepstrip env RESTRICT="" CHOST="${CHOST}" prepstrip "${D}${BINPATH}" - env RESTRICT="" CHOST="${CHOST}" prepstrip "${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}" + env RESTRICT="" CHOST="${CHOST}" prepstrip "${D}${PREFIX}/libexec/gcc/${CTARGET}/${PV}" env RESTRICT="" CHOST="${CTARGET}" prepstrip "${D}${LIBPATH}" } @@ -580,8 +580,8 @@ src_install() { export QA_WX_LOAD="usr/lib*/go/*/*.gox" # Disable RANDMMAP so PCH works. #301299 - pax-mark -r "${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}/cc1" - pax-mark -r "${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}/cc1plus" + pax-mark -r "${D}${PREFIX}/libexec/gcc/${CTARGET}/${PV}/cc1" + pax-mark -r "${D}${PREFIX}/libexec/gcc/${CTARGET}/${PV}/cc1plus" prune_libtool_files |