about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2015-09-23 11:43:49 -0400
committerSteve Klabnik <steve@steveklabnik.com>2015-09-23 11:43:49 -0400
commitf78115434c78d6d0aa7ecca7276cdd709c06cff6 (patch)
tree0158537cb9f2f259cf05caab8f5c716c8b4be8f5
parent07ca1ab1ec32ac99a61312ec07d66db5f3657040 (diff)
downloadrust-f78115434c78d6d0aa7ecca7276cdd709c06cff6.tar.gz
rust-f78115434c78d6d0aa7ecca7276cdd709c06cff6.zip
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/
-rw-r--r--mk/grammar.mk6
1 files 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