Rodrigo Mesquita pushed to branch wip/dcoutts/windows-rts-dll at Glasgow Haskell Compiler / GHC Commits: 75e4649d by Rodrigo Mesquita at 2026-05-06T16:38:17+01:00 WIP: fix FIND_LLVM_PROG bug for llvm-dlltool - - - - - 2 changed files: - configure.ac - m4/find_llvm_prog.m4 Changes: ===================================== configure.ac ===================================== @@ -575,7 +575,6 @@ dnl ** Which LLVM llvm-dlltool to use? dnl -------------------------------------------------------------- AC_ARG_VAR(DlltoolCmd,[Use as the path to LLVM's llvm-dlltool [default=autodetect]]) FIND_LLVM_PROG([DlltoolCmd], [llvm-dlltool], [$LlvmMinVersion], [$LlvmMaxVersion]) -AC_SUBST([DlltoolCmd]) dnl ** look to see if we have a C compiler using an llvm back end. dnl ===================================== m4/find_llvm_prog.m4 ===================================== @@ -15,10 +15,13 @@ AC_DEFUN([FIND_LLVM_PROG],[ AC_CHECK_TOOLS([$1], [$PROG_VERSION_CANDIDATES $2], []) AS_IF([test x"$$1" != x],[ PROG_VERSION=`$$1 --version | sed -n -e 's/.*version \(\([[0-9]][[0-9]]*\.\)\([[0-9]][[0-9]]*\.\)*[[0-9]][[0-9]]*\).*/\1/gp'` - AS_IF([test x"$PROG_VERSION" = x], - [AC_MSG_RESULT(no) - $1="" - AC_MSG_NOTICE([We only support llvm $3 upto $4 (non-inclusive) (no version found).])], + AS_IF([test x"$PROG_VERSION" = x] + [AS_IF( + [test x"$2" = x"llvm-dlltool"] + [AC_MSG_RESULT(yes)] # llvm-dlltool doesn't have a --version + [AC_MSG_RESULT(no) + AC_MSG_NOTICE([We only support llvm $3 upto $4 (non-inclusive) (no version found).])] + )], [AC_MSG_CHECKING([$$1 version ($PROG_VERSION) is between $3 and $4]) AX_COMPARE_VERSION([$PROG_VERSION], [lt], [$3], [AC_MSG_RESULT(no) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/75e4649ddc4561529a4945614cadb1a2... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/75e4649ddc4561529a4945614cadb1a2... You're receiving this email because of your account on gitlab.haskell.org.