Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion bazel/foreign_cc/hyperscan.patch
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ index 895610c..6be61fd 100755
PREFIX=$1
KEEPSYMS_IN=$2
shift 2
+
+set -e
+if [ -n "$EXT_BUILD_ROOT" ]; then
+ if [ -n "$NM" ]; then
+ case "$NM" in
Expand Down
17 changes: 13 additions & 4 deletions contrib/hyperscan/matching/input_matchers/source/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,19 @@ envoy_cmake(
"PYTHON_EXECUTABLE": "$(PYTHON3)",
},
default_cache_entries = {},
env = {
"NM": "$$EXT_BUILD_ROOT/$(NM)",
"OBJCOPY": "$$EXT_BUILD_ROOT/$(OBJCOPY)",
},
env = select({
# When using non-hermetic LLVM toolchain the paths to objcopy and nm will point
# to the host objcopy and nm, so there is no need to prefix those with the path
# to the directory with external dependencies.
"@envoy_repo//:use_local_llvm": {
"NM": "$(NM)",
"OBJCOPY": "$(OBJCOPY)",
},
"//conditions:default": {
"NM": "$$EXT_BUILD_ROOT/$(NM)",
"OBJCOPY": "$$EXT_BUILD_ROOT/$(OBJCOPY)",
},
}),
exec_properties = select({
"//bazel:engflow_rbe_x86_64": {
"Pool": "linux_x64_xlarge",
Expand Down
Loading