From: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
Date: Wed, 18 Oct 2023 19:50:19 +0000 (+0300)
Subject: fix-cross-compilation
X-Git-Tag: archive/raspbian/9.4.7-2+rpi1~2^2^2~8
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6bfc2adb208fd45197e91834731752ea381382bb;p=ghc.git

fix-cross-compilation

commit bd92182cd56140ffb2f68ec01492e5aa6333a8fc
Author: Ben Gamari <bgamari.foss@gmail.com>
Date:   Tue Jun 21 14:05:59 2022 +0000

    configure: Use AC_PATH_TOOL to detect tools

    Previously we used AC_PATH_PROG which, as noted by #21601, does not
    look for tools with a target prefix,
    breaking cross-compilation.

    Fixes #21601.


Gbp-Pq: Name fix-cross-compilation
---

diff --git a/configure.ac b/configure.ac
index 5d411c55..19239d7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -357,20 +357,17 @@ FP_FIND_ROOT
 if test "$HostOS" = "mingw32" -a "$EnableDistroToolchain" = "NO"; then
     FP_SETUP_WINDOWS_TOOLCHAIN
 else
-    # Ideally should use AC_CHECK_TARGET_TOOL but our triples
-    # are screwed up. Configure doesn't think they're ever equal and
-    # so never tried without the prefix.
-    AC_PATH_PROG([CC],[gcc], [clang])
-    AC_PATH_PROG([CXX],[g++], [clang++])
-    AC_PATH_PROG([NM],[nm])
+    AC_PATH_TOOL([CC],[gcc], [clang])
+    AC_PATH_TOOL([CXX],[g++], [clang++])
+    AC_PATH_TOOL([NM],[nm])
     # N.B. we don't probe for LD here but instead
     # do so in FIND_LD to avoid #21778.
-    AC_PATH_PROG([AR],[ar])
-    AC_PATH_PROG([RANLIB],[ranlib])
-    AC_PATH_PROG([OBJDUMP],[objdump])
-    AC_PATH_PROG([DllWrap],[dllwrap])
-    AC_PATH_PROG([Windres],[windres])
-    AC_PATH_PROG([Genlib],[genlib])
+    AC_PATH_TOOL([AR],[ar])
+    AC_PATH_TOOL([RANLIB],[ranlib])
+    AC_PATH_TOOL([OBJDUMP],[objdump])
+    AC_PATH_TOOL([DllWrap],[dllwrap])
+    AC_PATH_TOOL([Windres],[windres])
+    AC_PATH_TOOL([Genlib],[genlib])
 
     HAVE_GENLIB=False
     if test "$HostOS" = "mingw32"; then