Skip to content

Commit

Permalink
Do not silently disable mccs if a C++ compiler is not present
Browse files Browse the repository at this point in the history
Fixes #4452
  • Loading branch information
kit-ty-kate committed Apr 25, 2023
1 parent fd29dc4 commit 4147444
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 22 deletions.
18 changes: 3 additions & 15 deletions configure

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

10 changes: 3 additions & 7 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ AC_ARG_ENABLE([developer_mode],

AC_ARG_WITH([mccs],
AC_HELP_STRING([--without-mccs],
[Compile without a built-in Cudf solver (only works if 'mccs' is not otherwise installed)]),[],[MCCS_DEFAULT=yes]
[Compile without a built-in Cudf solver (only works if 'mccs' is not otherwise installed)])
)
AC_ARG_WITH([0install-solver],
AC_HELP_STRING([--without-0install-solver],
Expand Down Expand Up @@ -372,12 +372,8 @@ AS_IF([test "x$MCCS_ENABLED" = "xtrue"],[
AS_IF([test -n "$CXX"],[
CHECK_CXX_WORKS
AS_IF([test -z "$CXX"],[
AS_IF([test "x$MCCS_DEFAULT" = "xyes"],[
AC_SUBST(MCCS_ENABLED,false)
],[
AS_IF([test "x${enable_checks}" != "xno"],[
AC_MSG_ERROR([A C++ compiler is required to build mccs])
])
AS_IF([test "x${enable_checks}" != "xno"],[
AC_MSG_ERROR([A C++ compiler is required to build mccs])
])
])
])
Expand Down
1 change: 1 addition & 0 deletions master_changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ users)
* Specify the `opam` package for all rules that need `opamMain.exe.exe` [#5496 @Leonidas-from-XIV]
* Replace CPPO dependency with simple conditional compilation helper [#5498 @Leonidas-from-XIV]
* Remove conditional compilation [#5508 @Leonidas-from-XIV]
* Do not silently disable mccs if a C++ compiler is not present [#5527 @kit-ty-kate - fix #4452]

## Infrastructure
* Fix caching of Cygwin compiler on AppVeyor [#4988 @dra27]
Expand Down

0 comments on commit 4147444

Please sign in to comment.