Fixed macOS Kokoro build for new Bazel. (#159)

pull/13171/head
Joshua Haberman 6 years ago committed by Paul Yang
parent e999afb612
commit 00f96cb947
  1. 6
      BUILD
  2. 12
      build_defs.bzl

@ -28,6 +28,12 @@ COPTS = [
# copybara:strip_end # copybara:strip_end
] ]
config_setting(
name = "darwin",
values = {"cpu": "darwin"},
visibility = ["//visibility:public"],
)
# C/C++ rules ################################################################## # C/C++ rules ##################################################################
cc_library( cc_library(

@ -42,6 +42,12 @@ def lua_cclibrary(name, srcs, hdrs = [], deps = [], luadeps = []):
name = so_rule, name = so_rule,
linkshared = True, linkshared = True,
deps = [_librule(name)], deps = [_librule(name)],
linkopts = select({
":darwin": [
"-undefined dynamic_lookup",
],
"//conditions:default": [],
})
) )
native.genrule( native.genrule(
@ -196,7 +202,6 @@ def _upb_amalgamation(ctx):
) )
upb_amalgamation = rule( upb_amalgamation = rule(
implementation = _upb_amalgamation,
attrs = { attrs = {
"amalgamator": attr.label( "amalgamator": attr.label(
executable = True, executable = True,
@ -205,6 +210,7 @@ upb_amalgamation = rule(
"libs": attr.label_list(aspects = [_file_list_aspect]), "libs": attr.label_list(aspects = [_file_list_aspect]),
"outs": attr.output_list(), "outs": attr.output_list(),
}, },
implementation = _upb_amalgamation,
) )
is_bazel = not hasattr(native, "genmpm") is_bazel = not hasattr(native, "genmpm")
@ -268,7 +274,6 @@ def _upb_proto_reflection_library_srcs_impl(ctx):
return _upb_proto_srcs_impl(ctx, ".upbdefs") return _upb_proto_srcs_impl(ctx, ".upbdefs")
_upb_proto_library_srcs = rule( _upb_proto_library_srcs = rule(
implementation = _upb_proto_library_srcs_impl,
attrs = { attrs = {
"upbc": attr.label( "upbc": attr.label(
executable = True, executable = True,
@ -281,6 +286,7 @@ _upb_proto_library_srcs = rule(
), ),
"deps": attr.label_list(), "deps": attr.label_list(),
}, },
implementation = _upb_proto_library_srcs_impl,
) )
def upb_proto_library(name, deps, upbc): def upb_proto_library(name, deps, upbc):
@ -298,7 +304,6 @@ def upb_proto_library(name, deps, upbc):
) )
_upb_proto_reflection_library_srcs = rule( _upb_proto_reflection_library_srcs = rule(
implementation = _upb_proto_reflection_library_srcs_impl,
attrs = { attrs = {
"upbc": attr.label( "upbc": attr.label(
executable = True, executable = True,
@ -311,6 +316,7 @@ _upb_proto_reflection_library_srcs = rule(
), ),
"deps": attr.label_list(), "deps": attr.label_list(),
}, },
implementation = _upb_proto_reflection_library_srcs_impl,
) )
def upb_proto_reflection_library(name, deps, upbc): def upb_proto_reflection_library(name, deps, upbc):

Loading…
Cancel
Save