angstrom.conf: use python instead of overrides to select arm eabi on arm builds

diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf
index d8b9700..e9e0520 100644 (file)
--- a/conf/distro/angstrom.conf
+++ b/conf/distro/angstrom.conf
@@ -21,10 +21,10 @@ include conf/distro/include/multimachine.conf
 ENABLE_BINARY_LOCALE_GENERATION ?= ""
 
 
-#Use the ARM EABI when building for an ARM cpu.
-TARGET_VENDOR_arm = "-none"
-TARGET_OS_arm = "linux-gnueabi"
-TARGET_OS = "linux"
+#Use the ARM EABI when building for an ARM cpu. We can't use overrides
+#here because this breaks all places where ":=" is used.
+TARGET_VENDOR = "${@['','-none'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
+TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
 
 #mess with compiler flags to use -Os instead of -O2
 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info