From ba22e89b8e97f5008571957234bb3a1382c21628 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Mon, 8 Jan 2007 20:53:25 +0000
Subject: Promote eabi4 to become the eabi of choice for poky
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1120 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
meta/conf/distro/include/poky-eabi.inc | 21 +++++++++++++++++++++
meta/conf/distro/include/poky-eabi4.inc | 21 ---------------------
2 files changed, 21 insertions(+), 21 deletions(-)
create mode 100644 meta/conf/distro/include/poky-eabi.inc
delete mode 100644 meta/conf/distro/include/poky-eabi4.inc
diff --git a/meta/conf/distro/include/poky-eabi.inc b/meta/conf/distro/include/poky-eabi.inc
new file mode 100644
index 000000000..63467b46a
--- /dev/null
+++ b/meta/conf/distro/include/poky-eabi.inc
@@ -0,0 +1,21 @@
+#
+# Poky configuration to use EABI
+#
+
+PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
+
+PREFERRED_VERSION_gcc ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
+PREFERRED_VERSION_binutils ?= "2.17.50.0.5"
+PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5"
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
+PREFERRED_VERSION_glibc ?= "2.5"
+PREFERRED_VERSION_glibc-intermediate ?= "2.5"
+PREFERRED_VERSION_glibc-initial ?= "2.5"
+PREFERRED_VERSION_elfutils ?= "0.108"
+
+#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_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
diff --git a/meta/conf/distro/include/poky-eabi4.inc b/meta/conf/distro/include/poky-eabi4.inc
deleted file mode 100644
index 63467b46a..000000000
--- a/meta/conf/distro/include/poky-eabi4.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Poky configuration to use EABI
-#
-
-PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
-
-PREFERRED_VERSION_gcc ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
-PREFERRED_VERSION_binutils ?= "2.17.50.0.5"
-PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5"
-PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
-PREFERRED_VERSION_glibc ?= "2.5"
-PREFERRED_VERSION_glibc-intermediate ?= "2.5"
-PREFERRED_VERSION_glibc-initial ?= "2.5"
-PREFERRED_VERSION_elfutils ?= "0.108"
-
-#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_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
--
cgit v1.2.3