From c8dbca906af6783fd1dca595df4a5927bbe986a6 Mon Sep 17 00:00:00 2001 From: John Millikin Date: Mon, 23 Apr 2018 15:18:24 -0700 Subject: [PATCH] Adding missing `@bazel` prefixes that dependencies need. I tested https://github.com/envoyproxy/envoy/pull/3021 with envoy-filter-example to verify it works for non-default workspace roots, but didn't realize the filter example's envoy binary is built without linkstamping so the testing was worthless. Experimental evidence is that the `deps` field needs `@envoy` but the linker options are fine without it. I don't understand why this would be true so I'm going to put `@envoy` in both places. Signed-off-by: John Millikin --- bazel/envoy_build_system.bzl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bazel/envoy_build_system.bzl b/bazel/envoy_build_system.bzl index e220fd68f8d28..0e0a8358f799a 100644 --- a/bazel/envoy_build_system.bzl +++ b/bazel/envoy_build_system.bzl @@ -63,22 +63,22 @@ def _envoy_stamped_linkopts(): # MacOS doesn't have an official equivalent to the `.note.gnu.build-id` # ELF section, so just stuff the raw ID into a new text section. "@bazel_tools//tools/osx:darwin": [ - "-sectcreate __TEXT __build_id", "$(location //bazel:raw_build_id.ldscript)" + "-sectcreate __TEXT __build_id", "$(location @envoy//bazel:raw_build_id.ldscript)" ], # Note: assumes GNU GCC (or compatible) handling of `--build-id` flag. "//conditions:default": [ - "-Wl,@$(location //bazel:gnu_build_id.ldscript)", + "-Wl,@$(location @envoy//bazel:gnu_build_id.ldscript)", ], }) def _envoy_stamped_deps(): return select({ "@bazel_tools//tools/osx:darwin": [ - "//bazel:raw_build_id.ldscript" + "@envoy//bazel:raw_build_id.ldscript" ], "//conditions:default": [ - "//bazel:gnu_build_id.ldscript", + "@envoy//bazel:gnu_build_id.ldscript", ], })