Backed out changeset 80f21c20d24d (bug 1840537) for causing problems when running e.g. mach lint CLOSED TREE

build/moz.configure/init.configure

@@ -811,8 +811,8 @@ def target_variables(target):
         os_arch = target.kernel
 
     return namespace(
-        OS_TARGET=str(os_target),
-        OS_ARCH=str(os_arch),
+        OS_TARGET=os_target,
+        OS_ARCH=os_arch,
         INTEL_ARCHITECTURE=target.cpu in ("x86", "x86_64") or None,
     )
 

configure.py

@@ -237,6 +237,8 @@ def config_status(config, execute=True):
             return [normalize(o) for o in obj]
         return obj
 
+    sanitized_config = normalize(sanitized_config)
+
     # Create config.status. Eventually, we'll want to just do the work it does
     # here, when we're able to skip configure tests/use cached results/not rely
     # on autoconf.
@@ -246,7 +248,6 @@ def config_status(config, execute=True):
                 """\
             #!%(python)s
             # coding=utf-8
-            from mozbuild.configure.constants import *
         """
             )
             % {"python": config["PYTHON3"]}
@@ -271,7 +272,6 @@ def config_status(config, execute=True):
             )
 
     partial_config = PartialConfigEnvironment(config["TOPOBJDIR"])
-    sanitized_config = normalize(sanitized_config)
     partial_config.write_vars(sanitized_config)
 
     # Write out a file so the build backend knows to re-run configure when

media/libpng/moz.build

@@ -50,7 +50,7 @@ if CONFIG['INTEL_ARCHITECTURE']:
         'intel/intel_init.c'
     ]
 
-if CONFIG['CPU_ARCH'] in ('mips32', 'mips64'):
+if CONFIG['CPU_ARCH'] == 'mips':
     DEFINES['MOZ_PNG_USE_MIPS_MSA'] = True
     UNIFIED_SOURCES += [
         'mips/filter_msa_intrinsics.c',

python/mozbuild/mozbuild/configure/constants.py

@@ -6,14 +6,14 @@ from collections import OrderedDict
 
 from mozbuild.util import EnumString
 
-CompilerType = EnumString.subclass("CompilerType")(
+CompilerType = EnumString.subclass(
     "clang",
     "clang-cl",
     "gcc",
     "msvc",
 )
 
-OS = EnumString.subclass("OS")(
+OS = EnumString.subclass(
     "Android",
     "DragonFly",
     "FreeBSD",
@@ -26,7 +26,7 @@ OS = EnumString.subclass("OS")(
     "WASI",
 )
 
-Kernel = EnumString.subclass("Kernel")(
+Kernel = EnumString.subclass(
     "Darwin",
     "DragonFly",
     "FreeBSD",
@@ -62,19 +62,19 @@ CPU_bitness = {
     "wasm32": 32,
 }
 
-CPU = EnumString.subclass("CPU")(*CPU_bitness.keys())
+CPU = EnumString.subclass(*CPU_bitness.keys())
 
-Endianness = EnumString.subclass("Endianness")(
+Endianness = EnumString.subclass(
     "big",
     "little",
 )
 
-WindowsBinaryType = EnumString.subclass("WindowsBinaryType")(
+WindowsBinaryType = EnumString.subclass(
     "win32",
     "win64",
 )
 
-Abi = EnumString.subclass("Abi")(
+Abi = EnumString.subclass(
     "msvc",
     "mingw",
 )

python/mozbuild/mozbuild/test/test_util.py

@@ -824,7 +824,7 @@ class TestMisc(unittest.TestCase):
 
 class TestEnumString(unittest.TestCase):
     def test_string(self):
-        CompilerType = EnumString.subclass("Test")("gcc", "clang", "clang-cl")
+        CompilerType = EnumString.subclass("gcc", "clang", "clang-cl")
 
         type = CompilerType("gcc")
         self.assertEqual(type, "gcc")

python/mozbuild/mozbuild/util.py

@@ -1326,19 +1326,12 @@ class EnumString(six.text_type):
     def __hash__(self):
         return super(EnumString, self).__hash__()
 
-    def __repr__(self):
-        return f"{self.__class__.__name__}({str(self)!r})"
-
     @staticmethod
-    def subclass(name):
-        def create_subclass(*possible_values):
-            class EnumStringSubclass(EnumString):
-                POSSIBLE_VALUES = possible_values
+    def subclass(*possible_values):
+        class EnumStringSubclass(EnumString):
+            POSSIBLE_VALUES = possible_values
 
-            EnumStringSubclass.__name__ = name
-            return EnumStringSubclass
-
-        return create_subclass
+        return EnumStringSubclass
 
 
 def _escape_char(c):