Rollup merge of #38299 - achanda:ctrl-c, r=brson

[rust.git] / mk / grammar.mk

diff --git a/mk/grammar.mk b/mk/grammar.mk
index 8956983e3bee86712f6259ae564460f3ea3582da..1bd042adb218fdb958cc9a16bebd5f57e6ec1509 100644 (file)
--- a/mk/grammar.mk
+++ b/mk/grammar.mk
@@ -37,12 +37,12 @@ $(BG):
 
 $(BG)RustLexer.class: $(BG) $(SG)RustLexer.g4
        $(Q)$(CFG_ANTLR4) -o $(BG) $(SG)RustLexer.g4
-       $(Q)$(CFG_JAVAC) -d $(BG) $(BG)RustLexer.java
+       $(Q)$(CFG_JAVAC) -d $(BG) -classpath $(CFG_ANTLR4_JAR) $(BG)RustLexer.java
 
 check-build-lexer-verifier: $(BG)verify
 
-ifndef NO_REBUILD
-VERIFY_DEPS := rustc-stage2-H-$(CFG_BUILD) $(LD)stamp.rustc
+ifeq ($(NO_REBUILD),)
+VERIFY_DEPS :=  rustc-stage2-H-$(CFG_BUILD) $(LD)stamp.rustc
 else
 VERIFY_DEPS :=
 endif