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
2 changed files:
Changes:
| ... | ... | @@ -575,7 +575,6 @@ dnl ** Which LLVM llvm-dlltool to use? |
| 575 | 575 | dnl --------------------------------------------------------------
|
| 576 | 576 | AC_ARG_VAR(DlltoolCmd,[Use as the path to LLVM's llvm-dlltool [default=autodetect]])
|
| 577 | 577 | FIND_LLVM_PROG([DlltoolCmd], [llvm-dlltool], [$LlvmMinVersion], [$LlvmMaxVersion])
|
| 578 | -AC_SUBST([DlltoolCmd])
|
|
| 579 | 578 | |
| 580 | 579 | dnl ** look to see if we have a C compiler using an llvm back end.
|
| 581 | 580 | dnl
|
| ... | ... | @@ -15,10 +15,13 @@ AC_DEFUN([FIND_LLVM_PROG],[ |
| 15 | 15 | AC_CHECK_TOOLS([$1], [$PROG_VERSION_CANDIDATES $2], [])
|
| 16 | 16 | AS_IF([test x"$$1" != x],[
|
| 17 | 17 | PROG_VERSION=`$$1 --version | sed -n -e 's/.*version \(\([[0-9]][[0-9]]*\.\)\([[0-9]][[0-9]]*\.\)*[[0-9]][[0-9]]*\).*/\1/gp'`
|
| 18 | - AS_IF([test x"$PROG_VERSION" = x],
|
|
| 19 | - [AC_MSG_RESULT(no)
|
|
| 20 | - $1=""
|
|
| 21 | - AC_MSG_NOTICE([We only support llvm $3 upto $4 (non-inclusive) (no version found).])],
|
|
| 18 | + AS_IF([test x"$PROG_VERSION" = x]
|
|
| 19 | + [AS_IF(
|
|
| 20 | + [test x"$2" = x"llvm-dlltool"]
|
|
| 21 | + [AC_MSG_RESULT(yes)] # llvm-dlltool doesn't have a --version
|
|
| 22 | + [AC_MSG_RESULT(no)
|
|
| 23 | + AC_MSG_NOTICE([We only support llvm $3 upto $4 (non-inclusive) (no version found).])]
|
|
| 24 | + )],
|
|
| 22 | 25 | [AC_MSG_CHECKING([$$1 version ($PROG_VERSION) is between $3 and $4])
|
| 23 | 26 | AX_COMPARE_VERSION([$PROG_VERSION], [lt], [$3],
|
| 24 | 27 | [AC_MSG_RESULT(no)
|