diff options
| author | Philip Balister <philip@balister.org> | 2007-08-24 22:45:55 +0000 |
|---|---|---|
| committer | Philip Balister <philip@balister.org> | 2007-08-24 22:45:55 +0000 |
| commit | d3c806af5769e35b9b340aeacbe89a728902da28 (patch) | |
| tree | b7fd0f506f11179c27cf335df26296c96215a09d /conf | |
| parent | d260be2511026a0a8448bb5804eb33047765c9ce (diff) | |
| parent | 4d5fd1296adb60831900e2c070527bea00513a9f (diff) | |
merge of '828c7ed803d3e94f12cb5a5e38678504e4690482'
and '8ed8bbac9b9eebe40941ad7b6102eea1ea5dc6f0'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/angstrom-eglibc.inc | 1 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-glibc.inc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc index dc3929c3a7..91afb658e3 100644 --- a/conf/distro/include/angstrom-eglibc.inc +++ b/conf/distro/include/angstrom-eglibc.inc @@ -2,6 +2,7 @@ PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" PREFERRED_PROVIDER_virtual/libintl ?= "eglibc" PREFERRED_PROVIDER_virtual/libc ?= "eglibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "eglibc-initial" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "eglibc-intermediate" PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index 1eabe6b868..1502833389 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -2,7 +2,7 @@ PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" PREFERRED_PROVIDER_virtual/libintl ?= "glibc" PREFERRED_PROVIDER_virtual/libc ?= "glibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "glibc-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial" TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" |