diff options
| author | Ben Gamari <ben@well-typed.com> | 2022-06-21 14:05:59 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-07-19 02:34:47 -0400 |
| commit | bd92182cd56140ffb2f68ec01492e5aa6333a8fc (patch) | |
| tree | 867995fc6a444d1e9adc04de561bb54c3c3e3c4e | |
| parent | 4b98c5ce971b4ea6a2ca9e44f2d068088546751a (diff) | |
| download | haskell-bd92182cd56140ffb2f68ec01492e5aa6333a8fc.tar.gz | |
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.
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 71b5f680cf..daa28f4daf 100644 --- a/configure.ac +++ b/configure.ac @@ -350,20 +350,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 |