diff options
| author | Joshua Lock <josh@linux.intel.com> | 2010-07-21 18:35:09 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-21 20:21:22 +0100 |
| commit | 314fbb1c0519e5c9b44f35915dc346e0b7166e8e (patch) | |
| tree | ec523e8a6364ae16ec651ccfb2763a6873760c88 | |
| parent | 1d0d3e446209d364210d31dcfc5bad42fc942a2c (diff) | |
| download | openembedded-core-314fbb1c0519e5c9b44f35915dc346e0b7166e8e.tar.gz openembedded-core-314fbb1c0519e5c9b44f35915dc346e0b7166e8e.tar.bz2 openembedded-core-314fbb1c0519e5c9b44f35915dc346e0b7166e8e.zip | |
gcc-cross-canadian/meta-toolchain: Fix C++ compiler location and path issues
Signed-off-by: Joshua Lock <josh@linux.intel.com>
| -rw-r--r-- | meta/packages/gcc/gcc-configure-sdk.inc | 4 | ||||
| -rw-r--r-- | meta/packages/gcc/gcc-cross-canadian_4.3.3.bb | 2 | ||||
| -rw-r--r-- | meta/packages/meta/meta-toolchain.bb | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/meta/packages/gcc/gcc-configure-sdk.inc b/meta/packages/gcc/gcc-configure-sdk.inc index 25b4f31328..3b3f1f8047 100644 --- a/meta/packages/gcc/gcc-configure-sdk.inc +++ b/meta/packages/gcc/gcc-configure-sdk.inc @@ -4,8 +4,8 @@ require gcc-configure-common.inc 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=${SDKPATH}/${TARGET_SYS}${target_exec_prefix} \ - --with-gxx-include-dir=${prefix}/${TARGET_SYS}${target_includedir}/c++/${BINV}/ \ +EXTRA_OECONF_PATHS = "--with-local-prefix=${SDKPATH}/sysroots/${TARGET_SYS}${target_exec_prefix} \ + --with-gxx-include-dir=${SDKPATH}/sysroots/${TARGET_SYS}${target_includedir}/c++ \ --with-build-time-tools=${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin \ --with-sysroot=${SDKPATH}/sysroots/${TARGET_SYS} \ --with-build-sysroot=${STAGING_DIR_TARGET}" diff --git a/meta/packages/gcc/gcc-cross-canadian_4.3.3.bb b/meta/packages/gcc/gcc-cross-canadian_4.3.3.bb index 756339d6d1..7cc202363e 100644 --- a/meta/packages/gcc/gcc-cross-canadian_4.3.3.bb +++ b/meta/packages/gcc/gcc-cross-canadian_4.3.3.bb @@ -5,7 +5,7 @@ require gcc-cross-canadian.inc require gcc-configure-sdk.inc require gcc-package-sdk.inc -PR = "r15" +PR = "r16" DEPENDS += "gmp-nativesdk mpfr-nativesdk" RDEPENDS_${PN} += "mpfr-nativesdk" diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb index 7c39f5d854..ca24dbd807 100644 --- a/meta/packages/meta/meta-toolchain.bb +++ b/meta/packages/meta/meta-toolchain.bb @@ -87,6 +87,7 @@ do_populate_sdk() { echo 'export PKG_CONFIG_PATH=${SDKTARGETSYSROOT}${libdir}/pkgconfig' >> $script echo 'export CONFIG_SITE=${SDKPATH}/site-config-${TARGET_SYS}' >> $script echo 'export CC=${TARGET_PREFIX}gcc' >> $script + echo 'export CXX=${TARGET_PREFIX}g++' >> $script echo 'export CONFIGURE_FLAGS="--target=${TARGET_SYS} --host=${TARGET_SYS} --build=${SDK_ARCH}-linux"' >> $script if [ "${TARGET_OS}" = "darwin8" ]; then echo 'export TARGET_CFLAGS="-I${SDKTARGETSYSROOT}${includedir}"' >> $script |