[oe-commits] Phil Blundell : gcc: adjust some paths

[git version control]

Module: openembedded.git
Branch: pb/toolchain-desuck
Commit: 43b7b697e8900a5367b52052262b268a52290540
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=43b7b697e8900a5367b52052262b268a52290540

Author: Phil Blundell <philb at gnu.org>
Date:   Mon Feb  8 21:14:20 2010 +0000

gcc: adjust some paths

---

 recipes/gcc/gcc-configure-cross.inc |    4 +---
 recipes/gcc/gcc-package-cross.inc   |    2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/recipes/gcc/gcc-configure-cross.inc b/recipes/gcc/gcc-configure-cross.inc
index 8b97b09..3fcf8d3 100644
--- a/recipes/gcc/gcc-configure-cross.inc
+++ b/recipes/gcc/gcc-configure-cross.inc
@@ -2,9 +2,7 @@ require gcc-configure-common.inc
 
 USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
 
-EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
-		      --with-gxx-include-dir=${STAGING_DIR_TARGET}/${target_includedir}/c++ \
-                      --with-sysroot=${STAGING_DIR_TARGET} \
+EXTRA_OECONF_PATHS = "--with-sysroot=${STAGING_DIR_TARGET} \
                       --with-build-sysroot=${STAGING_DIR_TARGET}"
 
 do_configure_prepend () {
diff --git a/recipes/gcc/gcc-package-cross.inc b/recipes/gcc/gcc-package-cross.inc
index e5fb243..95c3414 100644
--- a/recipes/gcc/gcc-package-cross.inc
+++ b/recipes/gcc/gcc-package-cross.inc
@@ -2,7 +2,7 @@ INHIBIT_PACKAGE_STRIP ?= ""
 OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
 INHIBIT_PACKAGE_STRIP = "1"
 
-PACKAGES = "libgcc libssp libstdc++ libg2c libgfortran"
+PACKAGES += "libgcc libssp libstdc++ libg2c libgfortran"
 
 # Called from within gcc-cross, so libdir is set wrong
 FILES_libg2c = "${target_libdir}/libg2c.so.*"