summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-05-19 17:19:06 +0000
committerRichard Purdie <richard@openedhand.com>2008-05-19 17:19:06 +0000
commit7b86677ddeb5c347387978358c8abc57af6f28b1 (patch)
tree9da40b0e76dfc37922cc03df12af563f2190c12d /meta
parent20368362fd8ee2e8a670e98e676647278f02e761 (diff)
downloadopenembedded-core-7b86677ddeb5c347387978358c8abc57af6f28b1.tar.gz
openembedded-core-7b86677ddeb5c347387978358c8abc57af6f28b1.tar.bz2
openembedded-core-7b86677ddeb5c347387978358c8abc57af6f28b1.tar.xz
openembedded-core-7b86677ddeb5c347387978358c8abc57af6f28b1.zip
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
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/gcc/gcc-configure-sdk.inc2
-rw-r--r--meta/packages/gcc/gcc-configure-target.inc4
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/packages/gcc/gcc-configure-sdk.inc b/meta/packages/gcc/gcc-configure-sdk.inc
index f8c4de8c7..ddaa041ee 100644
--- 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 04045aa54..a3e274522 100644
--- 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}/"