diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index 1c9cf35a5de5..d698d6efde44 100755 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -85,7 +85,7 @@ with only_when(host_is_osx | target_is_osx): # When we change the SDK we build with, please update the manual SDK # installation docs: # https://firefox-source-docs.mozilla.org/setup/macos_build.html#macos-sdk-is-unsupported - sdk_min_version = Version("10.12") + sdk_min_version = Version("11.0") if sdk: sdk = sdk[0] diff --git a/docs/setup/macos_build.rst b/docs/setup/macos_build.rst index d632118ea4e2..76015a550d3b 100644 --- a/docs/setup/macos_build.rst +++ b/docs/setup/macos_build.rst @@ -142,25 +142,25 @@ macOS SDK is unsupported If the SDK included with your Xcode installation is not supported by Firefox, you'll need to manually install one that is compatible. -We're currently using the 10.12 SDK on our build servers, so that's the one that you +We're currently using the 11 SDK on our build servers, so that's the one that you should install: 1. Go to the `More Downloads for Apple Developers `_ page - and download Xcode 8.2. -2. Once downloaded, extract ``Xcode_8.2.xip``. + and download Xcode 12.5.1. +2. Once downloaded, extract ``Xcode_12.5.1.xip``. 3. In your terminal, copy the SDK from the installer: .. code-block:: shell mkdir -p ~/.mozbuild/macos-sdk # This assumes that Xcode is in your "Downloads" folder - cp -aH ~/Downloads/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk ~/.mozbuild/macos-sdk/ + cp -aH ~/Downloads/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk ~/.mozbuild/macos-sdk/ 4. Finally, inform the Firefox build about this SDK by creating (or editing) a file called ``mozconfig`` file in the Firefox source code directory. Add the following line: .. code-block:: - ac_add_options --with-macos-sdk=$HOME/.mozbuild/macos-sdk/MacOSX10.12.sdk + ac_add_options --with-macos-sdk=$HOME/.mozbuild/macos-sdk/MacOSX11.3.sdk 5. Now, you should be able to successfully run ``./mach build``. diff --git a/python/mozbuild/mozbuild/test/configure/fake_macos_sdk/SDKSettings.plist b/python/mozbuild/mozbuild/test/configure/fake_macos_sdk/SDKSettings.plist index 471f5576f906..ba93c87618c3 100644 --- a/python/mozbuild/mozbuild/test/configure/fake_macos_sdk/SDKSettings.plist +++ b/python/mozbuild/mozbuild/test/configure/fake_macos_sdk/SDKSettings.plist @@ -3,6 +3,6 @@ Version - 10.14 + 11.0