Skip to content

Commit 7ba5a61

Browse files
authored
Revert "expand locations in scalacopts (#890)"
This reverts commit 5c966ee.
1 parent 5c966ee commit 7ba5a61

File tree

4 files changed

+1
-71
lines changed

4 files changed

+1
-71
lines changed

scala/private/rule_impls.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ CurrentTarget: {current_target}
238238
compiler_classpath = _join_path(compiler_classpath_jars.to_list(), separator)
239239

240240
toolchain = ctx.toolchains["@io_bazel_rules_scala//scala:toolchain_type"]
241-
scalacopts = [ctx.expand_location(v, ctx.attr.plugins) for v in toolchain.scalacopts + in_scalacopts]
241+
scalacopts = toolchain.scalacopts + in_scalacopts
242242

243243
scalac_args = """
244244
Classpath: {cp}

test/plugins/BUILD

Lines changed: 0 additions & 40 deletions
This file was deleted.

test/plugins/check_expand_location_plugin.scala

Lines changed: 0 additions & 25 deletions
This file was deleted.

test/plugins/trivial.scala

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)