tor-browser

commit 25d2f39baf24c984167c9bc7ae5035beecbc6756
parent 788ef7442a830172407fe755f54d8ea82dc44c8d
Author: iulian moraru <imoraru@mozilla.com>
Date:   Tue, 11 Nov 2025 05:29:02 +0200

Revert "Bug 1999192 - Remove obsolete reference to --enable-dtrace r=ahochheiden" for causing python mozbuild failures on compare-mozconfigs.py.

This reverts commit 10ccb8b7144f2a267bd456f20441dddccd1bcd0c.

Diffstat:
M
browser/config/mozconfigs/allowlist
 | 
1
+
M
browser/config/mozconfigs/macosx64-aarch64/devedition
 | 
5
+++++
M
browser/config/mozconfigs/macosx64-aarch64/nightly
 | 
5
+++++
M
browser/config/mozconfigs/macosx64/devedition
 | 
5
+++++
M
browser/config/mozconfigs/macosx64/nightly
 | 
5
+++++

5 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/browser/config/mozconfigs/allowlist b/browser/config/mozconfigs/allowlist
@@ -14,6 +14,7 @@ for platform in all_platforms:
 
 allowlist['nightly']['macosx64'] += [
     'ac_add_options --enable-instruments',
+    'ac_add_options --enable-dtrace',
     'if test `uname -s` != Linux; then',
     'fi',
 ]
diff --git a/browser/config/mozconfigs/macosx64-aarch64/devedition b/browser/config/mozconfigs/macosx64-aarch64/devedition
@@ -5,6 +5,11 @@ MOZ_REQUIRE_SIGNING=
 
 ac_add_options --enable-instruments
 
+# Cross-compiled builds fail when dtrace is enabled
+if test `uname -s` != Linux; then
+  ac_add_options --enable-dtrace
+fi
+
 if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
 ac_add_options --with-macbundlename-prefix=Firefox
 fi
diff --git a/browser/config/mozconfigs/macosx64-aarch64/nightly b/browser/config/mozconfigs/macosx64-aarch64/nightly
@@ -2,6 +2,11 @@
 
 ac_add_options --enable-instruments
 
+# Cross-compiled builds fail when dtrace is enabled
+if test `uname -s` != Linux; then
+  ac_add_options --enable-dtrace
+fi
+
 ac_add_options --with-branding=browser/branding/nightly
 
 . "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/macosx64/devedition b/browser/config/mozconfigs/macosx64/devedition
@@ -5,6 +5,11 @@ MOZ_REQUIRE_SIGNING=
 
 ac_add_options --enable-instruments
 
+# Cross-compiled builds fail when dtrace is enabled
+if test `uname -s` != Linux; then
+  ac_add_options --enable-dtrace
+fi
+
 if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
 ac_add_options --with-macbundlename-prefix=Firefox
 fi
diff --git a/browser/config/mozconfigs/macosx64/nightly b/browser/config/mozconfigs/macosx64/nightly
@@ -2,6 +2,11 @@
 
 ac_add_options --enable-instruments
 
+# Cross-compiled builds fail when dtrace is enabled
+if test `uname -s` != Linux; then
+  ac_add_options --enable-dtrace
+fi
+
 ac_add_options --with-branding=browser/branding/nightly
 
 . "$topsrcdir/build/mozconfig.common.override"