Skip to content

Commit edeb4f1

Browse files
committed
Auto merge of #28603 - steveklabnik:small_config_fix, r=alexcrichton
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/
2 parents 07ca1ab + f781154 commit edeb4f1

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

mk/grammar.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,17 @@ check-lexer: $(BG) $(BG)RustLexer.class check-build-lexer-verifier
5858
$(Q)$(SG)check.sh $(S) "$(BG)" \
5959
"$(CFG_GRUN)" "$(BG)verify" "$(BG)RustLexer.tokens"
6060
else
61-
$(info cfg: grun not available, skipping lexer test...)
61+
$(info cfg: lexer tooling not available, skipping lexer test...)
6262
check-lexer:
6363

6464
endif
6565
else
66-
$(info cfg: antlr4 not available, skipping lexer test...)
66+
$(info cfg: lexer tooling not available, skipping lexer test...)
6767
check-lexer:
6868

6969
endif
7070
else
71-
$(info cfg: javac not available, skipping lexer test...)
71+
$(info cfg: lexer tooling not available, skipping lexer test...)
7272
check-lexer:
7373

7474
endif

0 commit comments

Comments
 (0)