Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1696513: Require macOS 11 SDK at configure time and update docs. r=mstange

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D148933
This commit is contained in:
Stephen A Pohl 2022-06-11 01:05:31 +00:00
parent 562eecc50f
commit b40f4b0786
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/moz.configure/toolchain.configure
View File

@ -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]

10
docs/setup/macos_build.rst
View File

@ -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``.

2
python/mozbuild/mozbuild/test/configure/fake_macos_sdk/SDKSettings.plist
View File

@ -3,6 +3,6 @@
<plist version="1.0">
<dict>
<key>Version</key>
<string>10.14</string>
<string>11.0</string>
</dict>
</plist>