Closed
Bug 1684380
Opened 3 years ago
Closed 3 years ago
Fix some error code paths.
Categories
(Firefox Build System :: General, defect)
Firefox Build System
General
Tracking
(firefox86 fixed)
RESOLVED
FIXED
86 Branch
Tracking | Status | |
---|---|---|
firefox86 | --- | fixed |
People
(Reporter: emilio, Assigned: emilio)
Details
Attachments
(1 file)
If you do something like this:
diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
index 4c6d73ee92f6..21953f823c82 100644
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -736,9 +736,9 @@ def split_triplet(triplet, allow_msvc=False):
if cpu.endswith("86") or (cpu.startswith("i") and "86" in cpu):
canonical_cpu = "x86"
endianness = "little"
- elif cpu in ("x86_64", "ia64"):
- canonical_cpu = cpu
- endianness = "little"
+ # elif cpu in ("x86_64", "ia64"):
+ # canonical_cpu = cpu
+ # endianness = "little"
elif cpu in ("s390", "s390x"):
canonical_cpu = cpu
endianness = "big"
You get output like this:
AttributeError: 'ValueError' object has no attribute 'message'
File "/home/emilio/src/moz/gecko-4/python/mach/mach/main.py", line 374, in run
return self._run(argv, sentry)
File "/home/emilio/src/moz/gecko-4/python/mach/mach/main.py", line 449, in _run
report_invocation_metrics(context.telemetry, handler.name)
File "/home/emilio/src/moz/gecko-4/python/mach/mach/telemetry.py", line 125, in report_invocation_metrics
metrics.mach.argv.set(filter_args(command, sys.argv, instance))
File "/home/emilio/src/moz/gecko-4/python/mozbuild/mozbuild/telemetry.py", line 326, in filter_args
instance.topobjdir: "$topobjdir/",
File "/home/emilio/src/moz/gecko-4/python/mozbuild/mozbuild/base.py", line 279, in topobjdir
self._topobjdir = self.resolve_mozconfig_topobjdir(
File "/home/emilio/src/moz/gecko-4/python/mozbuild/mozbuild/base.py", line 221, in resolve_mozconfig_topobjdir
topobjdir = self.mozconfig["topobjdir"] or default
File "/home/emilio/src/moz/gecko-4/python/mozbuild/mozbuild/base.py", line 359, in mozconfig
return self.mozconfig_and_target[0]
File "/home/emilio/src/moz/gecko-4/python/mozbuild/mozbuild/base.py", line 349, in mozconfig_and_target
return self.get_mozconfig_and_target(
File "/home/emilio/src/moz/gecko-4/python/mozbuild/mozbuild/util.py", line 1040, in __call__
self[args] = self.func(*args)
File "/home/emilio/src/moz/gecko-4/python/mozbuild/mozbuild/base.py", line 341, in get_mozconfig_and_target
sandbox._value_for(sandbox["real_target"]),
File "/home/emilio/src/moz/gecko-4/python/mozbuild/mozbuild/configure/__init__.py", line 610, in _value_for
return self._value_for_depends(self._depends[obj])
File "/home/emilio/src/moz/gecko-4/python/mozbuild/mozbuild/util.py", line 1049, in method_call
cache[args] = self.func(instance, *args)
File "/home/emilio/src/moz/gecko-4/python/mozbuild/mozbuild/configure/__init__.py", line 622, in _value_for_depends
value = obj.result()
File "/home/emilio/src/moz/gecko-4/python/mozbuild/mozbuild/util.py", line 1049, in method_call
cache[args] = self.func(instance, *args)
File "/home/emilio/src/moz/gecko-4/python/mozbuild/mozbuild/configure/__init__.py", line 161, in result
resolved_args = [self.sandbox._value_for(d) for d in self.dependencies]
File "/home/emilio/src/moz/gecko-4/python/mozbuild/mozbuild/configure/__init__.py", line 161, in <listcomp>
resolved_args = [self.sandbox._value_for(d) for d in self.dependencies]
File "/home/emilio/src/moz/gecko-4/python/mozbuild/mozbuild/configure/__init__.py", line 613, in _value_for
return self._value_for_depends(obj)
File "/home/emilio/src/moz/gecko-4/python/mozbuild/mozbuild/util.py", line 1049, in method_call
cache[args] = self.func(instance, *args)
File "/home/emilio/src/moz/gecko-4/python/mozbuild/mozbuild/configure/__init__.py", line 622, in _value_for_depends
value = obj.result()
File "/home/emilio/src/moz/gecko-4/python/mozbuild/mozbuild/util.py", line 1049, in method_call
cache[args] = self.func(instance, *args)
File "/home/emilio/src/moz/gecko-4/python/mozbuild/mozbuild/configure/__init__.py", line 162, in result
return self._func(*resolved_args)
File "/home/emilio/src/moz/gecko-4/python/mozbuild/mozbuild/configure/__init__.py", line 1293, in wrapped
return new_func(*args, **kwargs)
File "/home/emilio/src/moz/gecko-4/python/mozbuild/mozbuild/configure/__init__.py", line 896, in wrapper
ret = template(*args, **kwargs)
File "/home/emilio/src/moz/gecko-4/build/moz.configure/checks.configure", line 59, in wrapped
ret = func(*args, **kwargs)
File "/home/emilio/src/moz/gecko-4/python/mozbuild/mozbuild/configure/__init__.py", line 1293, in wrapped
return new_func(*args, **kwargs)
File "/home/emilio/src/moz/gecko-4/build/moz.configure/init.configure", line 876, in real_host
die(e.message)
The incoming patch turns it into the expected:
checking for vcs source checkout... git
Adding configure options from /home/emilio/src/moz/gecko-4/.mozconfig
checking for host system type...
DEBUG: Executing: `sh /home/emilio/src/moz/gecko-4/build/moz.configure/../autoconf/config.guess`
DEBUG: Executing: `sh /home/emilio/src/moz/gecko-4/build/moz.configure/../autoconf/config.sub x86_64-pc-linux-gnu`
ERROR: Unknown CPU type: x86_64
Assignee | ||
Comment 1•3 years ago
|
||
Pushed by ealvarez@mozilla.com: https://hg.mozilla.org/integration/autoland/rev/c39c70039770 Fix some configure error code paths. r=nalexander
Comment 3•3 years ago
|
||
bugherder |
Status: NEW → RESOLVED
Closed: 3 years ago
status-firefox86:
--- → fixed
Resolution: --- → FIXED
Target Milestone: --- → 86 Branch
You need to log in
before you can comment on or make changes to this bug.
Description
•