diff --git a/bazel/foreign_cc/BUILD b/bazel/foreign_cc/BUILD index 4754703329b9a..87c4fc3d9de59 100644 --- a/bazel/foreign_cc/BUILD +++ b/bazel/foreign_cc/BUILD @@ -43,6 +43,7 @@ cmake_external( "ENABLE_STATIC_LIB": "on", "ENABLE_LIB_ONLY": "on", "CMAKE_BUILD_TYPE": "RelWithDebInfo", + "CMAKE_INSTALL_LIBDIR": "lib", }, cmake_options = ["-GNinja"], lib_source = "@com_github_nghttp2_nghttp2//:all", diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 189f97ad8964d..a6a06fef8a166 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -363,7 +363,7 @@ def _com_github_c_ares_c_ares(): ) native.bind( name = "ares", - actual = "//bazel/foreign_cc:ares", + actual = "@envoy//bazel/foreign_cc:ares", ) def _com_github_cyan4973_xxhash(): @@ -456,7 +456,7 @@ def _com_github_jbeder_yaml_cpp(): ) native.bind( name = "yaml_cpp", - actual = "//bazel/foreign_cc:yaml", + actual = "@envoy//bazel/foreign_cc:yaml", ) def _com_github_libevent_libevent(): @@ -468,7 +468,7 @@ def _com_github_libevent_libevent(): ) native.bind( name = "event", - actual = "//bazel/foreign_cc:event", + actual = "@envoy//bazel/foreign_cc:event", ) def _com_github_madler_zlib(): @@ -480,7 +480,7 @@ def _com_github_madler_zlib(): ) native.bind( name = "zlib", - actual = "//bazel/foreign_cc:zlib", + actual = "@envoy//bazel/foreign_cc:zlib", ) def _com_github_nghttp2_nghttp2(): @@ -490,12 +490,12 @@ def _com_github_nghttp2_nghttp2(): build_file_content = BUILD_ALL_CONTENT, patch_args = ["-p1"], patch_cmds = ["find . -name '*.sh' -exec sed -i.orig '1s|#!/usr/bin/env sh\$|/bin/sh\$|' {} +"], - patches = ["//bazel/foreign_cc:nghttp2.patch"], + patches = ["@envoy//bazel/foreign_cc:nghttp2.patch"], **location ) native.bind( name = "nghttp2", - actual = "//bazel/foreign_cc:nghttp2", + actual = "@envoy//bazel/foreign_cc:nghttp2", ) def _io_opentracing_cpp():