Skip to content

Commit

Permalink
Fix incorrect error message in configure
Browse files Browse the repository at this point in the history
Somewhat confusingly, the architecture referred to the compiler which
had definitely just been found.
  • Loading branch information
dra27 committed Nov 10, 2023
1 parent c4961ba commit 3a1b9fa
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
4 changes: 3 additions & 1 deletion configure

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,10 @@ AS_IF([ test ${WIN32} -eq 1 ],[
AS_IF([ test "x${CC64}" = "x" ], [
AS_IF([ test "$ARCH" = "i386" ],
[T_CC64=x86_64-w64-mingw32-gcc
COMP_ARCH='x86_64'
ac_tool_prefix='i686-w64-mingw32-'],
[T_CC64=i686-w64-mingw32-gcc
COMP_ARCH='i686'
ac_tool_prefix='x86_64-w64-mingw32-'])])
AC_CHECK_TOOL(CC64,[${T_CC64}],[no])
AS_IF([ test "x${CC64}" != "xno" ],[
Expand Down Expand Up @@ -243,7 +245,7 @@ AS_IF([ test ${WIN32} -eq 1 ],[
])
])
AS_IF([ test "x${CC64}" = "xno" ],[
AC_MSG_ERROR([${ARCH} C compiler not found - opam-putenv cannot be built])
AC_MSG_ERROR([${COMP_ARCH} C compiler not found - opam-putenv cannot be built])
])
])

Expand Down
1 change: 1 addition & 0 deletions master_changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ users)
* Remove `bigarray` dependency [#5612 @kit-ty-kate]
* Remove use of deprecated `Printf.kprintf" [#5612 @kit-ty-kate]
* [BUG] Fix "make cold" on Windows when gcc is available [#5635 @kit-ty-kate - fixes #5600]
* Fix incorrect error message when alternate C compiler is missing [#5667 @dra27 - partial fix #5661]

## Infrastructure
* Test OCaml 5.0 and 5.1 in CI [#5672 @kit-ty-kate]
Expand Down

0 comments on commit 3a1b9fa

Please sign in to comment.