Skip to content

build: Fix envoy-filter-example build #3947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
htuch merged 1 commit into from
Jul 24, 2018
Merged

build: Fix envoy-filter-example build #3947

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions bazel/envoy_build_system.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def envoy_copts(repository, test = False):
]

return select({
"//bazel:windows_x86_64": msvc_options,
repository + "//bazel:windows_x86_64": msvc_options,
"//conditions:default": posix_options,
}) + select({
# Bazel adds an implicit -DNDEBUG for opt.
Expand Down Expand Up @@ -67,7 +67,7 @@ def envoy_linkopts():
"-pagezero_size 10000",
"-image_base 100000000",
],
"//bazel:windows_x86_64": [
"@envoy//bazel:windows_x86_64": [
"-DEFAULTLIB:advapi32.lib",
],
"//conditions:default": [
Expand All @@ -85,7 +85,7 @@ def _envoy_stamped_linkopts():
#
# /usr/bin/ld.gold: internal error in write_build_id, at ../../gold/layout.cc:5419
"@envoy//bazel:coverage_build": [],
"//bazel:windows_x86_64": [],
"@envoy//bazel:windows_x86_64": [],

# 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.
Expand Down Expand Up @@ -519,6 +519,6 @@ def envoy_select_force_libcpp(if_libcpp, default = None):
return select({
"@envoy//bazel:force_libcpp": if_libcpp,
"@bazel_tools//tools/osx:darwin": [],
"//bazel:windows_x86_64": [],
"@envoy//bazel:windows_x86_64": [],
"//conditions:default": default or [],
})