corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1692944 - Add a clang toolchain for arm64 mac. r=firefox-build-system-reviewers,andi,dmajor

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D105267
This commit is contained in:
Mike Hommey
2021-02-22 21:38:34 +00:00
parent 47d00cd583
commit 582bcdb036
4 changed files with 52 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
build/build-clang/build-clang.py
View File

@@ -337,9 +337,13 @@ def build_one_stage(
if libtool is not None:
cmake_args += ["-DCMAKE_LIBTOOL=%s" % slashify_path(libtool)]
if osx_cross_compile:
arch = "arm64" if os.environ.get("OSX_ARCH") == "arm64" else "x86_64"
target_cpu = (
"aarch64" if os.environ.get("OSX_ARCH") == "arm64" else "x86_64"
)
cmake_args += [
"-DCMAKE_SYSTEM_NAME=Darwin",
"-DCMAKE_SYSTEM_VERSION=10.12",
"-DCMAKE_SYSTEM_VERSION=%s" % os.environ["MACOSX_DEPLOYMENT_TARGET"],
"-DLIBCXXABI_LIBCXX_INCLUDES=%s" % libcxx_include_dir,
"-DCMAKE_OSX_SYSROOT=%s" % slashify_path(os.getenv("CROSS_SYSROOT")),
"-DCMAKE_FIND_ROOT_PATH=%s" % slashify_path(os.getenv("CROSS_SYSROOT")),
@@ -347,18 +351,22 @@ def build_one_stage(
"-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY",
"-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY",
"-DCMAKE_MACOSX_RPATH=ON",
"-DCMAKE_OSX_ARCHITECTURES=x86_64",
"-DDARWIN_osx_ARCHS=x86_64",
"-DCMAKE_OSX_ARCHITECTURES=%s" % arch,
"-DDARWIN_osx_ARCHS=%s" % arch,
"-DDARWIN_osx_SYSROOT=%s" % slashify_path(os.getenv("CROSS_SYSROOT")),
"-DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-apple-darwin",
"-DLLVM_DEFAULT_TARGET_TRIPLE=%s-apple-darwin" % target_cpu,
]
if os.environ.get("OSX_ARCH") == "arm64":
cmake_args += [
"-DDARWIN_osx_BUILTIN_ARCHS=arm64",
]
# Starting in LLVM 11 (which requires SDK 10.12) the build tries to
# detect the SDK version by calling xcrun. Cross-compiles don't have
# an xcrun, so we have to set the version explicitly.
if "MacOSX10.12.sdk" in os.getenv("CROSS_SYSROOT"):
cmake_args += [
"-DDARWIN_macosx_OVERRIDE_SDK_VERSION=10.12",
]
cmake_args += [
"-DDARWIN_macosx_OVERRIDE_SDK_VERSION=%s"
% os.environ["MACOSX_DEPLOYMENT_TARGET"],
]
if pgo_phase == "gen":
# Per https://releases.llvm.org/10.0.0/docs/HowToBuildWithPGO.html
cmake_args += [
@@ -772,7 +780,9 @@ if __name__ == "__main__":
raise ValueError("Config file needs to set gcc_dir")
if is_darwin() or osx_cross_compile:
os.environ["MACOSX_DEPLOYMENT_TARGET"] = "10.12"
os.environ["MACOSX_DEPLOYMENT_TARGET"] = (
"11.0" if os.environ.get("OSX_ARCH") == "arm64" else "10.12"
)
cc = get_tool(config, "cc")
cxx = get_tool(config, "cxx")