How to properly enforce an ARM OABI build?

[Sergey 'Jin' Bostandzhyan <jin@mediatomb.cc>]

Hi,

I want to build Angstrom for ARM OABI and I'm struggling to get the settings
right.

I'm using org.openembedded.stable and I tried this in my local conf:

MACHINE="armv4t"
DISTRO="angstrom-2007.1"
TARGET_OS :="linux"
ARM_ABI := "oabi"

ANGSTROM_MODE = "uclibc"
TARGET_FPU = "soft"

ENABLE_BINARY_LOCALE_GENERATION = "0"

My machine configuration does not do anything special either:
PACKAGE_EXTRA_ARCHS = "armv4 armv4t"
TARGET_ARCH = "arm"
require conf/machine/include/tune-arm920t.inc

Now.. I saw that Angstrom is using the ARM_ABI variable:
ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
require conf/distro/include/angstrom${ARM_ABI}.inc

Since it's ?= I should be able to override it, right?
The directory in the work dir also look interesting:
arm-oabi-angstrom-linux-uclibcgnueabi

And the toolchain got created as arm-angstrom-linux-uclibcgnueabi-*, the 
produced binaries are also EABI.

What am I missing? How do I force an OABI build for my machine?

Kind regards,
Jin