summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-01-11 12:07:43 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-01-11 12:07:43 +0000
commit365a06b3106bb1d18725452cc4777176c317b9d2 (patch)
tree1d728ac796338b67f49c4ebe69938b3f7a9c0791 /eclass
parentemul-linux-x86 updates. (Manifest recommit) (diff)
downloadgentoo-2-365a06b3106bb1d18725452cc4777176c317b9d2.tar.gz
gentoo-2-365a06b3106bb1d18725452cc4777176c317b9d2.tar.bz2
gentoo-2-365a06b3106bb1d18725452cc4777176c317b9d2.zip
Setting GCC_CONFIG_VER back to GCC_RELEASE_VER for now.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/toolchain.eclass10
1 files changed, 8 insertions, 2 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 05d3dd6b83e9..394329b9118f 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.73 2005/01/11 08:50:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.74 2005/01/11 12:07:43 eradicator Exp $
HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
LICENSE="GPL-2 LGPL-2.1"
@@ -44,7 +44,7 @@ fi
GCC_RELEASE_VER="$(get_version_component_range 1-3)"
GCC_BRANCH_VER="$(get_version_component_range 1-2)"
-GCC_CONFIG_VER="${PV}"
+GCC_CONFIG_VER="${GCC_RELEASE_VER}"
GCCMAJOR="$(get_version_component_range 1)"
GCCMINOR="$(get_version_component_range 2)"
GCCMICRO="$(get_version_component_range 3)"
@@ -1333,6 +1333,12 @@ gcc_movelibs() {
rm -f ${D}${LIBPATH}/libiberty.a
rm -f ${D}${LIBPATH}/*/libiberty.a
+ #local FROMDIR=${D}/${LIBPATH}/../${GCC_RELEASE_VER}
+ #[ -d "${FROMDIR}" ] && mv ${FROMDIR}/* ${LIBPATH}
+
+ #FROMDIR=${D}/${PREFIX}/libexec/gcc/${CTARGET}/${GCC_RELEASE_VER}
+ #[ -d "${FROMDIR}" ] && mv ${FROMDIR}/* ${FROMDIR}/../
+
if [ -n "${MULTILIB_ABIS}" ]; then
for abi in ${MULTILIB_ABIS}; do
local OS_MULTIDIR=$(${XGCC} $(get_abi_CFLAGS ${abi}) --print-multi-os-directory)