Move javac check after toolchain check (#16)

* Should check javac after checking if toolchain has set it
please-build · Aug 26, 2022 · 5fb54f6 · 5fb54f6
1 parent f98438a
commit 5fb54f6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.plzconfig b/.plzconfig
@@ -70,7 +70,6 @@ Inherit = True
 [Plugin "java"]
 Toolchain = //third_party/java:toolchain
 JunitRunner = //tools/junit_runner
-JavacTool = "javac"
 
 [FeatureFlags]
 ExcludeJavaRules = true
diff --git a/build_defs/java.build_defs b/build_defs/java.build_defs
@@ -58,14 +58,14 @@ def java_library(name:str, srcs:list=None, src_dir:str=None, resources:list=[],
         javac = CONFIG.JAVA.JAVAC_TOOL
         javac_worker = CONFIG.JAVA.JAVAC_WORKER
 
-        if not javac and not javac_worker:
-            fail('Either java.javac_tool or java.javac_worker must be set in the config')
-
         # Override old config if we have a toolchain configured
         if toolchain:
             javac = f'{toolchain}|javac'
             javac_worker = ''
 
+        if not javac and not javac_worker:
+            fail('Either java.javac_tool or java.javac_worker must be set in the config')
+
         if not javac:
             javac = CONFIG.JAVA.JAVAC_WORKER
             mflag = '--modular' if modular else ''

diff --git a/example/.plzconfig b/example/.plzconfig
@@ -5,6 +5,7 @@ PreloadSubincludes = ///java//build_defs:java
 Target = //plugins:java
 Toolchain = //third_party/java:toolchain
 JunitRunner = //_please:junit_runner
+JavacTool = "javac"
 
 [FeatureFlags]
 ExcludeJavaRules = true