зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1825401 - Part 1. Update OpenH264 MacOSX toolchain configuration to match Firefox. r=jmaher
In bug 1680152, we bumped the minimum OSX version from 10.11 to 10.12 (for Firefox 85). In bug 1812215, we bumped the default OSX SDK to 13.0 (for Firefox 111). This also resolves build issues for missing headers. Differential Revision: https://phabricator.services.mozilla.com/D174009
This commit is contained in:
Родитель
dd41d5c292
Коммит
9ba9922c65
|
@ -99,7 +99,7 @@ jobs:
|
|||
- linux64-clang
|
||||
- linux64-dump_syms
|
||||
- linux64-nasm
|
||||
- macosx64-sdk-10.11
|
||||
- macosx64-sdk-toolchain
|
||||
macosx64-aarch64/opt:
|
||||
attributes:
|
||||
build_platform: macosx64-aarch64
|
||||
|
@ -123,7 +123,7 @@ jobs:
|
|||
- linux64-cctools-port
|
||||
- linux64-clang
|
||||
- linux64-dump_syms
|
||||
- macosx64-sdk-11.0
|
||||
- macosx64-sdk-toolchain
|
||||
win32/opt:
|
||||
attributes:
|
||||
build_platform: win32
|
||||
|
|
|
@ -22,13 +22,15 @@ config = {
|
|||
"partial_env": {
|
||||
"CFLAGS": (
|
||||
"-target aarch64-apple-darwin -mcpu=apple-a12 "
|
||||
"-isysroot {MOZ_FETCHES_DIR}/MacOSX11.0.sdk".format(
|
||||
"-isysroot {MOZ_FETCHES_DIR}/MacOSX13.0.sdk "
|
||||
"-mmacosx-version-min=11.0".format(
|
||||
MOZ_FETCHES_DIR=os.environ["MOZ_FETCHES_DIR"]
|
||||
)
|
||||
),
|
||||
"LDFLAGS": (
|
||||
"-target aarch64-apple-darwin -mcpu=apple-a12 "
|
||||
"-isysroot {MOZ_FETCHES_DIR}/MacOSX11.0.sdk".format(
|
||||
"-isysroot {MOZ_FETCHES_DIR}/MacOSX13.0.sdk "
|
||||
"-mmacosx-version-min=11.0".format(
|
||||
MOZ_FETCHES_DIR=os.environ["MOZ_FETCHES_DIR"]
|
||||
)
|
||||
),
|
||||
|
|
|
@ -22,15 +22,15 @@ config = {
|
|||
"partial_env": {
|
||||
"CXXFLAGS": (
|
||||
"-target x86_64-apple-darwin "
|
||||
"-isysroot {MOZ_FETCHES_DIR}/MacOSX10.11.sdk "
|
||||
"-mmacosx-version-min=10.11".format(
|
||||
"-isysroot {MOZ_FETCHES_DIR}/MacOSX13.0.sdk "
|
||||
"-mmacosx-version-min=10.12".format(
|
||||
MOZ_FETCHES_DIR=os.environ["MOZ_FETCHES_DIR"]
|
||||
)
|
||||
),
|
||||
"LDFLAGS": (
|
||||
"-target x86_64-apple-darwin "
|
||||
"-isysroot {MOZ_FETCHES_DIR}/MacOSX10.11.sdk "
|
||||
"-mmacosx-version-min=10.11".format(
|
||||
"-isysroot {MOZ_FETCHES_DIR}/MacOSX13.0.sdk "
|
||||
"-mmacosx-version-min=10.12".format(
|
||||
MOZ_FETCHES_DIR=os.environ["MOZ_FETCHES_DIR"]
|
||||
)
|
||||
),
|
||||
|
|
Загрузка…
Ссылка в новой задаче