diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /tools/rb | |
parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tools/rb')
-rwxr-xr-x | tools/rb/fix_stacks.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tools/rb/fix_stacks.py b/tools/rb/fix_stacks.py index f30aa9944a..29aa396219 100755 --- a/tools/rb/fix_stacks.py +++ b/tools/rb/fix_stacks.py @@ -16,7 +16,7 @@ from subprocess import PIPE, Popen # Matches lines produced by MozFormatCodeAddress(), e.g. # `#01: ???[tests/example +0x43a0]`. -line_re = re.compile("#\d+: .+\[.+ \+0x[0-9A-Fa-f]+\]") +line_re = re.compile(r"#\d+: .+\[.+ \+0x[0-9A-Fa-f]+\]") fix_stacks = None @@ -35,9 +35,6 @@ def autobootstrap(): ) moz_configure = os.path.join(buildconfig.topsrcdir, "build", "moz.configure") sandbox.include_file(os.path.join(moz_configure, "init.configure")) - # bootstrap_search_path_order has a dependency on developer_options, which - # is not defined in init.configure. Its value doesn't matter for us, though. - sandbox["developer_options"] = sandbox["always"] sandbox.include_file(os.path.join(moz_configure, "bootstrap.configure")) # Expand the `bootstrap_path` template for "fix-stacks", and execute the # expanded function via `_value_for`, which will trigger autobootstrap. |