gcc-configure-*.inc: Fix up local-prefix and gcc-include-dir options

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4502 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/gcc/gcc-configure-sdk.inc b/meta/packages/gcc/gcc-configure-sdk.inc
index f8c4de8c78dfc70547d4d839ceed1775fb60735b..ddaa041ee911dabd86e0ab60b688152a54bc9bde 100644 (file)
--- a/meta/packages/gcc/gcc-configure-sdk.inc
+++ b/meta/packages/gcc/gcc-configure-sdk.inc
@@ -5,7 +5,7 @@ USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
 USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}'
 
 EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \
-                      --with-gxx-include-dir=${STAGING_DIR_TARGET}/${layout_includedir}/c++ \
+                      --with-gxx-include-dir=${prefix}/${TARGET_SYS}${layout_includedir}/c++/${BINV}/ \
                       --with-sysroot=${prefix}/${TARGET_SYS} \
                       --with-build-sysroot=${STAGING_DIR_TARGET}"
 

diff --git a/meta/packages/gcc/gcc-configure-target.inc b/meta/packages/gcc/gcc-configure-target.inc
index 04045aa541a8a8624e89e7bc117c2a9e289b84c0..a3e274522ce5f88ae80b081c230a5e6fc109ad1f 100644 (file)
--- a/meta/packages/gcc/gcc-configure-target.inc
+++ b/meta/packages/gcc/gcc-configure-target.inc
@@ -1,6 +1,6 @@
 require gcc-configure-common.inc
 
 EXTRA_OECONF_PATHS = " \
-    --with-local-prefix=${prefix}/local \
-    --with-gxx-include-dir=${includedir}/c++/${BINV}"
+    --with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \
+    --with-gxx-include-dir=${includedir}/c++/${BINV}/"