Revert "expand locations in scalacopts (bazelbuild#890)" (bazelbuild#904

) This reverts commit 5c966ee.
SocksDevil · Jul 6, 2020 · 50e3311 · 50e3311
1 parent f5ec991
commit 50e3311
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 71 deletions.
diff --git a/scala/private/rule_impls.bzl b/scala/private/rule_impls.bzl
@@ -239,7 +239,7 @@ CurrentTarget: {current_target}
     compiler_classpath = _join_path(compiler_classpath_jars.to_list(), separator)
 
     toolchain = ctx.toolchains["@io_bazel_rules_scala//scala:toolchain_type"]
-    scalacopts = [ctx.expand_location(v, ctx.attr.plugins) for v in toolchain.scalacopts + in_scalacopts]
+    scalacopts = toolchain.scalacopts + in_scalacopts
 
     scalac_args = """
 Classpath: {cp}

diff --git a/test/plugins/BUILD b/test/plugins/BUILD
diff --git a/test/plugins/check_expand_location_plugin.scala b/test/plugins/check_expand_location_plugin.scala
diff --git a/test/plugins/trivial.scala b/test/plugins/trivial.scala