diff options
| author | Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2019-07-23 16:29:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-23 16:29:53 -0700 |
| commit | 1ee1e362565f681fdd46f16bf9f70f51c905ddd4 (patch) | |
| tree | 1afe90f7f32d257fadc34b55f1596b6b85eae4f9 /bazel | |
| parent | a73ae437869089bcea8af2e85bb41a07aea27422 (diff) | |
| parent | a2013f0fc21300768b87714d8a4db0a5cd845028 (diff) | |
Merge pull request #193 from nicolasnoble/windows-flags
Disabling gcc flags for Windows build.
Diffstat (limited to 'bazel')
| -rw-r--r-- | bazel/upb_proto_library.bzl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bazel/upb_proto_library.bzl b/bazel/upb_proto_library.bzl index d62770b..cc6bcff 100644 --- a/bazel/upb_proto_library.bzl +++ b/bazel/upb_proto_library.bzl @@ -159,7 +159,7 @@ def _compile_upb_protos(ctx, proto_info, proto_sources, ext): arguments = [ "--upb_out=" + _get_real_root(srcs[0]), "--plugin=protoc-gen-upb=" + ctx.executable._upbc.path, - "--descriptor_set_in=" + ":".join([f.path for f in transitive_sets]), + "--descriptor_set_in=" + ctx.configuration.host_path_separator.join([f.path for f in transitive_sets]), ] + [_get_real_short_path(file) for file in proto_sources], progress_message = "Generating upb protos for :" + ctx.label.name, @@ -175,7 +175,10 @@ def _upb_proto_rule_impl(ctx): "_WrappedGeneratedSrcsInfo (aspect should have handled this).") cc_info = dep[_WrappedCcInfo].cc_info srcs = dep[_WrappedGeneratedSrcsInfo].srcs - lib = cc_info.linking_context.libraries_to_link.to_list()[0] + if (type(cc_info.linking_context.libraries_to_link) == "list"): + lib = cc_info.linking_context.libraries_to_link[0] + else: + lib = cc_info.linking_context.libraries_to_link.to_list()[0] files = _filter_none([ lib.static_library, lib.pic_static_library, |