diff --git a/pkg/sentry/socket/plugin/cgo/BUILD b/pkg/sentry/socket/plugin/cgo/BUILD index ca083dbb5..eae551468 100644 --- a/pkg/sentry/socket/plugin/cgo/BUILD +++ b/pkg/sentry/socket/plugin/cgo/BUILD @@ -19,20 +19,25 @@ go_library( "stack_unsafe.go", "util_unsafe.go", ], - bazel_cdeps = [ - "@libpluginstack//:libpluginstack", - ], + bazel_cdeps = select({ + ":network_plugins": ["@libpluginstack//:libpluginstack"], + "//conditions:default": [], + }), bazel_cgo = select({ ":network_plugins": True, "//conditions:default": False, }), - bazel_clinkopts = [ - "-L external/libpluginstack", - ], - bazel_copts = [ - "-march=native", - "-I external/libpluginstack/lib/libtle_glue", - ], + bazel_clinkopts = select({ + ":network_plugins": ["-L external/libpluginstack"], + "//conditions:default": [], + }), + bazel_copts = select({ + ":network_plugins": [ + "-march=native", + "-I external/libpluginstack/lib/libtle_glue", + ], + "//conditions:default": [], + }), visibility = ["//visibility:public"], deps = [ "//pkg/abi/linux", diff --git a/tools/bazeldefs/go.bzl b/tools/bazeldefs/go.bzl index b922e38df..a2449c82f 100644 --- a/tools/bazeldefs/go.bzl +++ b/tools/bazeldefs/go.bzl @@ -85,13 +85,12 @@ def go_library(name, bazel_cgo = False, bazel_cdeps = [], bazel_clinkopts = [], cgo_copts: cgo opts to pass to `go_library`. **kwargs: rest of the arguments are passed to `go_library`. """ - if bazel_cgo == True: - kwargs["cgo"] = bazel_cgo - kwargs["cdeps"] = bazel_cdeps - kwargs["clinkopts"] = bazel_clinkopts - kwargs["copts"] = bazel_copts _go_library( name = name, + cgo = bazel_cgo, + cdeps = bazel_cdeps, + copts = bazel_copts, + clinkopts = bazel_clinkopts, importpath = "gvisor.dev/gvisor/" + native.package_name(), **kwargs )