# HG changeset patch # User "Yann E. MORIN" # Date 1263058234 -3600 # Node ID 39970edb42e52908e756b8a4b2a1685b04fecdee # Parent 49c09d2e27fe36fda4ec28d224f044d8cd28692d libc/uClibc: do not mangle ARM {E,O}ABI when ARCH != ARM (manualy transplanted from 2ad2cbc1f709f48a195746476a71f1244cc67cee) (transplanted from 2ad2cbc1f709f48a195746476a71f1244cc67cee)) diff -r 49c09d2e27fe -r 39970edb42e5 scripts/build/libc/uClibc.sh --- a/scripts/build/libc/uClibc.sh Wed Dec 30 15:38:03 2009 +0100 +++ b/scripts/build/libc/uClibc.sh Sat Jan 09 18:30:34 2010 +0100 @@ -198,17 +198,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 >>"${munge_file}" <<-ENDSED + if [ "${CT_ARCH}" = "arm" ]; then + # Hack the ARM {E,O}ABI into the config file + if [ "${CT_ARCH_ARM_EABI}" = "y" ]; then + cat >>"${munge_file}" <<-ENDSED s/.*(CONFIG_ARM_OABI).*/# \\1 is not set/ s/.*(CONFIG_ARM_EABI).*/\\1=y/ ENDSED - else - cat >>"${munge_file}" <<-ENDSED + else + cat >>"${munge_file}" <<-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