Bug 1792666 - Use -isysroot instead of --sysroot on mac. r=firefox-bu…

…ild-system-reviewers,nalexander Differential Revision: https://phabricator.services.mozilla.com/D158302
dothq · Sep 29, 2022 · ff425dd · ff425dd
1 parent f0ffbdc
commit ff425dd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
@@ -1176,7 +1176,10 @@ def compiler(
         wrapper = list(compiler_wrapper or ())
         flags = []
         if sysroot.path:
-            flags.extend(("--sysroot", sysroot.path))
+            if host_or_target.kernel == "Darwin":
+                flags.extend(("-isysroot", sysroot.path))
+            else:
+                flags.extend(("--sysroot", sysroot.path))
         if host_or_target.os == "OSX" and macos_target:
             flags.append("-mmacosx-version-min=%s" % macos_target)
         if provided_compiler:

diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
@@ -887,7 +887,7 @@ class OSXToolchainTest(BaseToolchainTest):
     SYSROOT_FLAGS = {
         "flags": PrependFlags(
             [
-                "--sysroot",
+                "-isysroot",
                 xcrun("", ("--show-sdk-path",))[1],
                 "-mmacosx-version-min=10.12",
             ]

diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_helpers.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_helpers.py
@@ -217,8 +217,8 @@ def __call__(self, stdin, args):
             if arg is None:
                 break
             if arg.startswith("-"):
-                # Ignore --sysroot and the argument that follows it.
-                if arg == "--sysroot":
+                # Ignore -isysroot/--sysroot and the argument that follows it.
+                if arg in ("-isysroot", "--sysroot"):
                     next(args, None)
                 else:
                     flags.append(arg)