summaryrefslogtreecommitdiff
path: root/recipes/gcc
diff options
context:
space:
mode:
authorTom Rini <trini@embeddedalley.com>2009-04-07 16:22:07 -0700
committerTom Rini <trini@embeddedalley.com>2009-04-07 16:22:07 -0700
commitae48ce485442fa2c1a7d0552bf6b4ea10fe692cf (patch)
tree3455ecc629509c99c853eadc5a41e12be80d2790 /recipes/gcc
parentec31872ec8e83079e983869504eef39fa98a4233 (diff)
gcc-canadian-sdk: Fix C++ relocation, add SYSROOT, use SDK_REALPATH_MINGW, bump PR.
Diffstat (limited to 'recipes/gcc')
-rw-r--r--recipes/gcc/gcc-canadian-sdk_4.2.4.bb2
-rw-r--r--recipes/gcc/gcc-configure-canadian-sdk.inc7
2 files changed, 5 insertions, 4 deletions
diff --git a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb
index ae3245bf7f..d78ab75c81 100644
--- a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb
+++ b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb
@@ -1,6 +1,6 @@
inherit canadian-sdk
-PR = "r1"
+PR = "r2"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
diff --git a/recipes/gcc/gcc-configure-canadian-sdk.inc b/recipes/gcc/gcc-configure-canadian-sdk.inc
index c95a6c41df..738b120a45 100644
--- a/recipes/gcc/gcc-configure-canadian-sdk.inc
+++ b/recipes/gcc/gcc-configure-canadian-sdk.inc
@@ -61,11 +61,12 @@ export WINDRES_FOR_TARGET="${TARGET_PREFIX}windres"
EXTRA_OECONF_DEP ?= ""
EXTRA_OECONF += ""
+# On MinGW hosts we want to prepend a drive letter, in ${SDK_REALPATH_MINGW}
+# to the sysroot path.
+SYSROOT = "${@['${SDK_REALPATH}/${TARGET_SYS}', '${SDK_REALPATH_MINGW}${SDK_REALPATH}/${TARGET_SYS}'][bb.data.getVar('SDK_OS', d, 1) in ['mingw32', 'mingw64']]}"
EXTRA_OECONF_PATHS = " \
- --with-local-prefix=$dollar{prefix}/local \
- --with-gxx-include-dir=$dollar{prefix}/${TARGET_SYS}/usr/include/c++/${BINV} \
--with-build-sysroot=${STAGING_DIR_TARGET} \
- --with-sysroot=${SDK_REALPATH}/${TARGET_SYS} \
+ --with-sysroot=${SYSROOT} \
"
do_configure () {