Run Bazel without --define=ORIGINID=$originId

This should help avoid redundant rebuilds Merge-request: BAZEL-MR-465 Merged-by: Andrzej Gluszak <Andrzej.Gluszak@jetbrains.com>
JetBrains · Aug 23, 2023 · 8238ab4 · 8238ab4
1 parent 3b4e1f7
commit 8238ab4
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/bazelrunner/src/main/java/org/jetbrains/bsp/bazel/bazelrunner/BazelRunner.kt b/bazelrunner/src/main/java/org/jetbrains/bsp/bazel/bazelrunner/BazelRunner.kt
@@ -51,9 +51,8 @@ class BazelRunner private constructor(
         parseProcessOutput: Boolean = true,
     ): BazelProcess {
         val workspaceContext = workspaceContextProvider.currentWorkspaceContext()
-        val flagsWithOrigin = if (originId != null) flags + "--define=ORIGINID=$originId" else flags
         val processArgs =
-            listOf(bazel(workspaceContext), command) + buildFlags(workspaceContext) + flagsWithOrigin + arguments
+            listOf(bazel(workspaceContext), command) + buildFlags(workspaceContext) + flags + arguments
         logInvocation(processArgs, originId)
         val processBuilder = ProcessBuilder(processArgs)
         val outputLogger = bspClientLogger.takeIf { parseProcessOutput }