From 41578219c30d48ed5b31072bc5be7490d6a9c1e9 Mon Sep 17 00:00:00 2001
From: Or Shachar <ors@wix.com>
Date: Tue, 16 Jan 2018 15:44:28 +0200
Subject: [PATCH] fixed merge issues with scalac_opts

---
 scala/scala.bzl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scala/scala.bzl b/scala/scala.bzl
index 791c931b90..237e24b728 100644
--- a/scala/scala.bzl
+++ b/scala/scala.bzl
@@ -193,7 +193,12 @@ CurrentTarget: {current_target}
     compiler_classpath = separator.join([j.path for j in compiler_classpath_jars])
 
     toolchain = ctx.toolchains['@io_bazel_rules_scala//scala:toolchain_type']
-    scalacopts = toolchain.scalacopts + ctx.attr.scalacopts    
+        # always append -YdisableFlatCpCaching, workaround for
+        # https://github.com/bazelbuild/rules_scala/issues/305
+        # ~remove once we upgrade to Scala 2.12.4~
+        # ^^ turns out that 2.12.4 didn't fix the issue, see:
+        # https://github.com/bazelbuild/rules_scala/pull/310#issuecomment-337466097
+    scalacopts = toolchain.scalacopts + ctx.attr.scalacopts + ["-YdisableFlatCpCaching"]
 
     scalac_args = """
 Classpath: {cp}