summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCheng Shao <cheng.shao@tweag.io>2021-01-24 13:38:04 +0000
committerCheng Shao <cheng.shao@tweag.io>2021-10-14 12:52:57 +0000
commitc1b850dd6ee8a7a6814c894bf3cf9e04195d9bef (patch)
treecaf82267cce4fb38a657175165e927a1ba4c0680
parent2db32ec52469981e7e11648e12a9d74d6c67ffd7 (diff)
downloadhaskell-c1b850dd6ee8a7a6814c894bf3cf9e04195d9bef.tar.gz
Respect $AR in configure script
Previously, the configure script doesn't respect $AR. This causes the nixpkgs GHC to capture "ar" instead of the absolute nix store path of ar in the global config. The original patch comes from https://github.com/input-output-hk/haskell.nix/blob/master/overlays/patches/ghc/respect-ar-path.patch. (cherry picked from commit 0da1f19e0d4bfe57706a5f74de8301ae5e106381)
-rw-r--r--aclocal.m43
1 files changed, 2 insertions, 1 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 47d69c5c1c..14adbfaf6e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1210,7 +1210,8 @@ AC_SUBST([LdHasFilelist])
# thinks that target == host so it never checks the unqualified
# tools for Windows. See #14274.
AC_DEFUN([FP_PROG_AR],
-[if test -z "$fp_prog_ar"; then
+[AC_SUBST(fp_prog_ar,$AR)
+if test -z "$fp_prog_ar"; then
if test "$HostOS" = "mingw32"
then
AC_PATH_PROG([fp_prog_ar], [ar])