Skip to content

Commit

Permalink
Merge pull request google#1076 from hzeller:20230723-backtrace-hermetic
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 550387816
  • Loading branch information
copybara-github committed Jul 23, 2023
2 parents 26a8b5c + 6bd8019 commit 44b271a
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 0 deletions.
29 changes: 29 additions & 0 deletions dependency_support/boost/backtrace_from_rule.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
--- boost.BUILD 2023-07-22 21:40:32.570049258 -0700
+++ boost.BUILD 2023-07-23 07:33:08.760174104 -0700
@@ -1901,18 +1901,6 @@
"//conditions:default": [],
}),
exclude_src = ["libs/stacktrace/src/*.cpp"],
- linkopts = select({
- ":linux_ppc": [
- "-lbacktrace -ldl",
- ],
- ":linux_x86_64": [
- "-lbacktrace -ldl",
- ],
- ":linux_aarch64": [
- "-lbacktrace -ldl",
- ],
- "//conditions:default": [],
- }),
deps = [
":array",
":config",
@@ -1922,6 +1910,7 @@
":predef",
":static_assert",
":type_traits",
+ "@com_github_libbacktrace//:libbacktrace",
],
)

1 change: 1 addition & 0 deletions dependency_support/boost/workspace.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,6 @@ def repo():
# toolchain. The patch below selects the same Python headers
# that the rest of XLS uses.
"@com_google_xls//dependency_support/boost:add_python.patch",
"@com_google_xls//dependency_support/boost:backtrace_from_rule.patch",
],
)

0 comments on commit 44b271a

Please sign in to comment.