diff options
| author | Peter Pentchev <roam@ringlet.net> | 2021-11-27 00:38:49 +0200 |
|---|---|---|
| committer | Michal Domonkos <mdomonko@redhat.com> | 2022-07-01 10:52:14 +0200 |
| commit | 63a45b6eeab91e4874abc88e36973f14c9c7b96e (patch) | |
| tree | 26078a8af6279168ff1a99df00248e85c1df2f77 | |
| parent | 57687ca49e560fe2f6eb4b04cfa33b337d330da9 (diff) | |
| download | rpm-63a45b6eeab91e4874abc88e36973f14c9c7b96e.tar.gz | |
Fix the build on armhf and mipsel.
There were two problems here: first, the -gnueabihf and -gnuabi64
suffixes were not recognized at all, and second, -gnueabihf was
misdetected as -gnueabi since the regular expression is not precise
enough (no "$" at the end), leading to an inconsistent situation of
host_os_gnu being set (incorrectly) and the suffix *not* removed from
host_os.
(cherry picked from commit e6277e4ab016d71d4017568eb996c91fc63bcde9)
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index f1eeb1ff5..312cbe8f5 100644 --- a/configure.ac +++ b/configure.ac @@ -833,10 +833,18 @@ host_os_gnu=-gnu if echo "$host_os" | grep '.*-gnulibc1' > /dev/null ; then host_os=`echo "${host_os}" | sed 's/-gnulibc1$//'` fi +if echo "$host_os" | grep '.*-gnueabihf' > /dev/null ; then + host_os=`echo "${host_os}" | sed 's/-gnueabihf$//'` + host_os_gnu=-gnueabihf +fi if echo "$host_os" | grep '.*-gnueabi' > /dev/null ; then host_os=`echo "${host_os}" | sed 's/-gnueabi$//'` host_os_gnu=-gnueabi fi +if echo "$host_os" | grep '.*-gnuabi64' > /dev/null ; then + host_os=`echo "${host_os}" | sed 's/-gnuabi64$//'` + host_os_gnu=-gnuabi64 +fi if echo "$host_os" | grep '.*-gnu' > /dev/null ; then host_os=`echo "${host_os}" | sed 's/-gnu$//'` fi |