Skip to content

Commit 5e07252

Browse files
RandomDSdevelkawashima-fj
authored andcommitted
config/opal_setup_java.m4: Fix open-mpi#5015.
That PR accidentally changed Open MPI's build configuration infrastruc- ture's Java toolchain detection logic so that it would, as reported by @bosilca in open-mpi#5001 (comment) and tracked down by me in open-mpi#5001 (comment), abort your entire in-progress Open MPI build when it failed to find an OS X/macOS JDK instead of simply falling back to checking for a JDK in locations where it would be found on other platforms. _Oops…!_ Signed-off-by: Bryce Glover <[email protected]> (cherry picked from commit 4a05c7e)
1 parent 849ea95 commit 5e07252

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

config/opal_setup_java.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ AC_DEFUN([OPAL_SETUP_JAVA],[
112112
with_jdk_headers=$opal_java_dir/include
113113
with_jdk_bindir=$opal_java_dir/bin
114114
else
115-
AC_MSG_WARN([No recognized directory structure found under $opal_java_dir])
116-
AC_MSG_ERROR([Cannot continue])
115+
AC_MSG_WARN([No recognized OS X/macOS JDK directory structure found under $opal_java_dir])
116+
opal_java_found=0
117117
fi],
118118
[AC_MSG_RESULT([not found])])
119119

0 commit comments

Comments
 (0)