nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 14:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Workaround javac popup on MacOS X

Browse Source 
MacOS X does not ship with Java installed by default. Instead it
includes binary stubs that upon execution pop up a message suggesting
the installation of the JDK.

Since `javac` is only used when `antlr4` is available, it is possible
to work around the popup by only probing for `javac` if `antlr4` has
been successfully detected (in which case the JDK is probably already
installed on the system).

Fixes #23138.
This commit is contained in:
Andrea Canciani 2015-04-03 15:05:54 +02:00
parent 82dcec7ee4
commit 0621a83ba5
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure vendored
View File

@ -669,7 +669,6 @@ probe CFG_LD ld
probe CFG_VALGRIND valgrind probe CFG_VALGRIND valgrind
probe CFG_PERF perf probe CFG_PERF perf
probe CFG_ISCC iscc probe CFG_ISCC iscc
probe CFG_JAVAC javac
probe CFG_ANTLR4 antlr4 probe CFG_ANTLR4 antlr4
probe CFG_GRUN grun probe CFG_GRUN grun
probe CFG_FLEX flex probe CFG_FLEX flex
@ -679,6 +678,14 @@ probe CFG_XELATEX xelatex
probe CFG_GDB gdb probe CFG_GDB gdb
probe CFG_LLDB lldb probe CFG_LLDB lldb
# On MacOS X, invoking `javac` pops up a dialog if the JDK is not
# installed. Since `javac` is only used if `antlr4` is available,
# probe for it only in this case.
if [ ! -z "$CFG_ANTLR4" ]
then
probe CFG_JAVAC javac
fi
if [ ! -z "$CFG_GDB" ] if [ ! -z "$CFG_GDB" ]
then then
# Store GDB's version # Store GDB's version