Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit c069885

Browse files
Bug 1957023 - Remove references to old-configure invocation r=glandium
This is done in the most failsafe way by making sure that all variables that where previously set through MOZ_CREATE_CONFIG_STATUS() from old-configure are still set from init.configure. Some of them are probably not used by the build system but their removal is left to another patch, as this excision is already a big change in itself. As a side effect, remove all m4-related configuration and usage. This impacts all mozconfig files that used to just set a variable to be passed to the configuration step, instead of exporting them. As this method was relying on old-configure, we now require to export the variables to be passed to the configure step, the others are ignored (but can still be used as local variables). Differential Revision: https://phabricator.services.mozilla.com/D243457
1 parent 6e43b5e commit c069885

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+104
-6645
lines changed

.gitignore

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ ID
5353
/mozconfig*
5454
/.moz-fast-forward
5555
/.moz-vendoring
56-
/old-configure
57-
/config.cache
58-
/config.log
5956
/.clang_complete
6057
/machrc
6158
/.machrc
@@ -113,10 +110,6 @@ toolkit/components/translations/bergamot-translator/thirdparty
113110
/js/src/*-obj/
114111
/js/src/obj-*/
115112

116-
# SpiderMonkey configury
117-
js/src/old-configure
118-
js/src/autom4te.cache
119-
120113
# SpiderMonkey test result logs
121114
js/src/tests/results-*.html
122115
js/src/tests/results-*.txt

.hgignore

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@
4949
^mozconfig*
5050
^\.moz-fast-forward
5151
^\.moz-vendoring
52-
^old-configure$
53-
^config\.cache$
54-
^config\.log$
5552
^\.clang_complete
5653
^machrc$
5754
^\.machrc$
@@ -109,10 +106,6 @@ _OPT\.OBJ/
109106
^js/src/.*-obj/
110107
^js/src/obj-.*/
111108

112-
# SpiderMonkey configury
113-
^js/src/old-configure$
114-
^js/src/autom4te\.cache$
115-
116109
# SpiderMonkey test result logs
117110
^js/src/tests/results-.*\.html$
118111
^js/src/tests/results-.*\.txt$

aclocal.m4

Lines changed: 0 additions & 14 deletions
This file was deleted.

browser/config/mozconfigs/linux32/devedition

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
. "$topsrcdir/browser/config/mozconfigs/linux32/common-opt"
22

33
# Add-on signing is not required for DevEdition
4-
MOZ_REQUIRE_SIGNING=
4+
unset MOZ_REQUIRE_SIGNING
55

66
ac_add_options --with-branding=browser/branding/aurora
77

browser/config/mozconfigs/linux32/nightly-fuzzing-asan

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
ac_add_options --enable-debug-symbols=-gline-tables-only
44

55
# Add-on signing is checked but not enforced
6-
MOZ_REQUIRE_SIGNING=
6+
unset MOZ_REQUIRE_SIGNING
77

88
# ASan specific options on Linux
99
ac_add_options --enable-valgrind

browser/config/mozconfigs/linux64/add-on-devel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
. $topsrcdir/browser/config/mozconfigs/linux64/nightly
22

33
#add-on signing is checked but not enforced
4-
MOZ_REQUIRE_SIGNING=
4+
unset MOZ_REQUIRE_SIGNING
55

66
ac_add_options --with-branding=browser/branding/unofficial
77
ac_add_options --enable-update-channel=default

browser/config/mozconfigs/linux64/debug-searchfox-clang

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
MOZ_AUTOMATION_BUILD_SYMBOLS=0
2-
MOZ_AUTOMATION_CHECK=0
1+
export MOZ_AUTOMATION_BUILD_SYMBOLS=0
2+
export MOZ_AUTOMATION_CHECK=0
33

44
. "$topsrcdir/build/unix/mozconfig.unix"
55

browser/config/mozconfigs/linux64/debug-static-analysis-clang

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
MOZ_AUTOMATION_BUILD_SYMBOLS=0
1+
export MOZ_AUTOMATION_BUILD_SYMBOLS=0
22

33
. "$topsrcdir/build/mozconfig.common"
44

browser/config/mozconfigs/linux64/devedition

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
. "$topsrcdir/browser/config/mozconfigs/linux64/common-opt"
22

33
# Add-on signing is not required for DevEdition
4-
MOZ_REQUIRE_SIGNING=
4+
unset MOZ_REQUIRE_SIGNING
55

66
ac_add_options --with-branding=browser/branding/aurora
77

browser/config/mozconfigs/linux64/nightly-fuzzing-asan

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ac_add_options --enable-debug-symbols=-gline-tables-only
22

33
#add-on signing is checked but not enforced
4-
MOZ_REQUIRE_SIGNING=
4+
unset MOZ_REQUIRE_SIGNING
55

66
# ASan specific options on Linux
77
ac_add_options --enable-valgrind

0 commit comments

Comments
 (0)