0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch 1.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748
  1. From edc0757c56090364e0a95aabfa9f645a16a27569 Mon Sep 17 00:00:00 2001
  2. From: Peter Korsgaard <peter@korsgaard.com>
  3. Date: Fri, 2 Aug 2019 15:53:16 +0200
  4. Subject: [PATCH] configure.ac: fixup $CC --print-multiarch output for
  5. musl/uclibc GCC 8+ toolchains
  6. GCC commit 6834b83784dcf0364eb820e8 (multiarch support for non-glibc linux
  7. systems), which is part of GCC 8+, changed the multiarch logic to use
  8. $arch-linux-musl / $arch-linux-uclibc rather than $arch-linux-gnu.
  9. This then causes the python3 configure script to error out:
  10. checking for the platform triplet based on compiler characteristics... powerpc-linux-gnu
  11. configure: error: internal configure error for the platform triplet, please file a bug report
  12. http://autobuild.buildroot.net/results/cb4/cb49c539501342e45cbe5ade82e588fcdf51f05b
  13. As it requires that the --print-multiarch output (if not empty) matches the
  14. deduced triplet (which always uses -linux-gnu).
  15. It isn't quite clear why --print-multiarch returns something for a
  16. non-multiarch toolchain on some architectures (E.G. PowerPC), but as a
  17. workaround, rewrite the --print-multiarch output to match older GCC versions
  18. to keep the configure script happy.
  19. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  20. ---
  21. configure.ac | 4 +++-
  22. 1 file changed, 3 insertions(+), 1 deletion(-)
  23. diff --git a/configure.ac b/configure.ac
  24. index 615c16aced..241298e6cf 100644
  25. --- a/configure.ac
  26. +++ b/configure.ac
  27. @@ -718,7 +718,9 @@ then
  28. fi
  29. -MULTIARCH=$($CC --print-multiarch 2>/dev/null)
  30. +# GCC 8+ returns $arch-linux-{musl,uclibc} for musl/uClibc based
  31. +# toolchains confusing python. Fix that up
  32. +MULTIARCH=$($CC --print-multiarch 2>/dev/null | sed -E 's/-linux-(musl|uclibc)*$/-linux-gnu/')
  33. AC_SUBST(MULTIARCH)
  34. AC_MSG_CHECKING([for the platform triplet based on compiler characteristics])
  35. --
  36. 2.25.1