From f78115434c78d6d0aa7ecca7276cdd709c06cff6 Mon Sep 17 00:00:00 2001 From: Steve Klabnik Date: Wed, 23 Sep 2015 11:43:49 -0400 Subject: [PATCH] Make lexer tooling message more generic We don't actually probe for javac in all circumstances, so if you have javac installed, but don't have antlr4 installed, and you're on Mac OS X, then you'll get a message that javac is missing, even though that's wrong. To fix this, let's just be a bit more generic in the message, so that it's the same no matter what part of the lexer tests you're missing. cc https://www.reddit.com/r/rust/comments/3m199d/running_make_check_on_the_source_code_says_javac/ --- mk/grammar.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mk/grammar.mk b/mk/grammar.mk index d9c66e282bc..0d527bd0688 100644 --- a/mk/grammar.mk +++ b/mk/grammar.mk @@ -58,17 +58,17 @@ check-lexer: $(BG) $(BG)RustLexer.class check-build-lexer-verifier $(Q)$(SG)check.sh $(S) "$(BG)" \ "$(CFG_GRUN)" "$(BG)verify" "$(BG)RustLexer.tokens" else -$(info cfg: grun not available, skipping lexer test...) +$(info cfg: lexer tooling not available, skipping lexer test...) check-lexer: endif else -$(info cfg: antlr4 not available, skipping lexer test...) +$(info cfg: lexer tooling not available, skipping lexer test...) check-lexer: endif else -$(info cfg: javac not available, skipping lexer test...) +$(info cfg: lexer tooling not available, skipping lexer test...) check-lexer: endif