# HG changeset patch # User "Yann E. MORIN" # Date 1262361175 -3600 # Node ID 2ad2cbc1f709f48a195746476a71f1244cc67cee # Parent 8699778e3888d360554fe8ae53a4f7553b10f7fc libc/uClibc: do not mangle ARM {E,O}ABI when ARCH != ARM diff -r 8699778e3888 -r 2ad2cbc1f709 scripts/build/libc/uClibc.sh --- a/scripts/build/libc/uClibc.sh Fri Jan 01 18:47:20 2010 +0100 +++ b/scripts/build/libc/uClibc.sh Fri Jan 01 16:52:55 2010 +0100 @@ -201,17 +201,19 @@ ENDSED # Ah. We may one day need architecture-specific handler here... - # Hack the ARM {E,O}ABI into the config file - if [ "${CT_ARCH_ARM_EABI}" = "y" ]; then - cat <<-ENDSED - s/.*(CONFIG_ARM_OABI).*/# \\1 is not set/ - s/.*(CONFIG_ARM_EABI).*/\\1=y/ - ENDSED - else - cat <<-ENDSED - s/.*(CONFIG_ARM_OABI).*/\\1=y/ - s/.*(CONFIG_ARM_EABI).*/# \\1 is not set/ - ENDSED + if [ "${CT_ARCH}" = "arm" ]; then + # Hack the ARM {E,O}ABI into the config file + if [ "${CT_ARCH_ARM_EABI}" = "y" ]; then + cat <<-ENDSED + s/.*(CONFIG_ARM_OABI).*/# \\1 is not set/ + s/.*(CONFIG_ARM_EABI).*/\\1=y/ + ENDSED + else + cat <<-ENDSED + s/.*(CONFIG_ARM_OABI).*/\\1=y/ + s/.*(CONFIG_ARM_EABI).*/# \\1 is not set/ + ENDSED + fi fi # Accomodate for old and new uClibc versions, where the