commit 994918b4b93335921f1355b96a6cb532e10436b6
author hlopko <hlopko@google.com> Fri Oct 19 04:23:44 2018 -0400
committer Rein Hillmann <rein@google.com> Wed Oct 24 15:30:18 2018 -0400
tree fcae6d8e9f34df19d0466531f0eb7bc1fbe7eaaa
parent 19e8b557e79747773aecd425acc575cefeaadedb

Migrate users of C++ toolchain API for --incompatible_disable_depset_in_cc_user_flags

This is a migration needed do move g3 forward so unknown commit can be submitted,
and in case of Bazel users, to make them forward compatible with Bazel 0.20.
Migration details and discussion are over at github:

https://github.com/bazelbuild/bazel/issues/6383

PiperOrigin-RevId: 217837227

src/TulsiGenerator/Bazel/tulsi/tulsi_aspects.bzl

diff --git a/src/TulsiGenerator/Bazel/tulsi/tulsi_aspects.bzl b/src/TulsiGenerator/Bazel/tulsi/tulsi_aspects.bzl
index f43833c..96f3ad8 100644
--- a/src/TulsiGenerator/Bazel/tulsi/tulsi_aspects.bzl
+++ b/src/TulsiGenerator/Bazel/tulsi/tulsi_aspects.bzl
@@ -488,13 +488,13 @@
         c_variables = cc_common.create_compile_variables(
             feature_configuration = feature_configuration,
             cc_toolchain = cc_toolchain,
-            user_compile_flags = depset(copts + conlyopts),
+            user_compile_flags = copts + conlyopts,
         )
         cpp_variables = cc_common.create_compile_variables(
             feature_configuration = feature_configuration,
             cc_toolchain = cc_toolchain,
             add_legacy_cxx_options = True,
-            user_compile_flags = depset(copts + cxxopts),
+            user_compile_flags = copts + cxxopts,
         )
         c_options = cc_common.get_memory_inefficient_command_line(
             feature_configuration = feature_configuration,