Skip to content

Commit

Permalink
Bug 1696513: Require macOS 11 SDK at configure time and update docs. …
Browse files Browse the repository at this point in the history
…r=mstange

Differential Revision: https://phabricator.services.mozilla.com/D148933
  • Loading branch information
Stephen A Pohl committed Jun 10, 2022
1 parent 9805023 commit a26f934
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion build/moz.configure/toolchain.configure
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
10 changes: 5 additions & 5 deletions docs/setup/macos_build.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://developer.apple.com/download/more/>`_ 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``.

0 comments on commit a26f934

Please sign in to comment.