aboutsummaryrefslogtreecommitdiffstats
path: root/meta/conf/machine
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-10-04 10:37:05 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-25 21:36:18 +0000
commitc51643a510da6d1c3426b3de8f18ae864cb073a4 (patch)
treec0a2e6826bc59bfbacb9ab856d8489f423a14f6b /meta/conf/machine
parent0d8adb1b57bf435f888c9357d40d1e2dae10d07f (diff)
downloadopenembedded-core-c51643a510da6d1c3426b3de8f18ae864cb073a4.tar.gz
tune-xscale: replace TUNE_CCARGS for webkit-gtk and cairo only with xscale in TUNE_FEATURES
* without this you'll get different sstate checksum for webkit-gtk and cairo even when you build them with DEFAULTTUNE == armv5te * maybe this isn't needed at all anymore or if it is then it should be applied in arm-armv5.inc for all armv5te devices, not only xscale? Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine')
-rw-r--r--meta/conf/machine/include/tune-xscale.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/machine/include/tune-xscale.inc b/meta/conf/machine/include/tune-xscale.inc
index 80a3683666..0d5d060d04 100644
--- a/meta/conf/machine/include/tune-xscale.inc
+++ b/meta/conf/machine/include/tune-xscale.inc
@@ -15,5 +15,5 @@ PACKAGE_EXTRA_ARCHS_tune-xscale-be = "${PACKAGE_EXTRA_ARCHS_tune-armv5teb}"
# webkit-gtk has alignment issues with double instructions on armv5 so
# disable them here
-TUNE_CCARGS_pn-webkit-gtk = "-march=armv4t"
-TUNE_CCARGS_pn-cairo = "-march=armv4t"
+TUNE_CCARGS_pn-webkit-gtk = "${@bb.utils.contains("TUNE_FEATURES", "xscale", "-march=armv4t", "", d)}"
+TUNE_CCARGS_pn-cairo = "${@bb.utils.contains("TUNE_FEATURES", "xscale", "-march=armv4t", "", d)}"