diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-01-09 17:30:34 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-01-09 17:30:34 (GMT) |
| commit | f6b01572348ae44c7cc9a2b7433b7099b2ce7b6a (patch) | |
| tree | ee94613b599edc2f93a8c7f3b8d7d624450a9657 | |
| parent | bcd6129f14e6d742bf22a96070f4f184b1ef0588 (diff) | |
libc/uClibc: do not mangle ARM {E,O}ABI when ARCH != ARM
(manualy transplanted from 2ad2cbc1f709f48a195746476a71f1244cc67cee)
(transplanted from 2ad2cbc1f709f48a195746476a71f1244cc67cee))
| -rw-r--r-- | scripts/build/libc/uClibc.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh index 1465e01..f441f14 100644 --- a/scripts/build/libc/uClibc.sh +++ b/scripts/build/libc/uClibc.sh @@ -198,17 +198,19 @@ s/.*(DOSTRIP).*/# \\1 is not set/ 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 |