From 18704e0274af872a3e6ab10f8293c062f75e4ef6 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Thu, 19 Nov 2020 20:25:20 +0000 Subject: [PATCH] Bug 1678291 - Default to use private frameworks from the SDK. r=firefox-build-system-reviewers,mhentges And don't set it via mozconfig. The default to /System/Library/PrivateFrameworks may also not have matched the used SDK previously, so the new default is better. Differential Revision: https://phabricator.services.mozilla.com/D97564 --- build/macosx/cross-mozconfig.common | 2 -- build/moz.configure/toolchain.configure | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build/macosx/cross-mozconfig.common b/build/macosx/cross-mozconfig.common index 8e39b2643f46..c3c8bc1f1ce6 100644 --- a/build/macosx/cross-mozconfig.common +++ b/build/macosx/cross-mozconfig.common @@ -17,7 +17,6 @@ mk_add_options "export LD_LIBRARY_PATH=$MOZ_FETCHES_DIR/clang/lib" # Upload the resulting tarball from /tmp to tooltool, and change the entry in # `browser/config/tooltool-manifests/macosx64/cross-releng.manifest`. CROSS_SYSROOT=$topsrcdir/MacOSX10.11.sdk -CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks export CC="$MOZ_FETCHES_DIR/clang/bin/clang" export CXX="$MOZ_FETCHES_DIR/clang/bin/clang++" @@ -36,7 +35,6 @@ export HOST_LDFLAGS="-g" ac_add_options --target=x86_64-apple-darwin export MACOS_SDK_DIR=$CROSS_SYSROOT -export MACOS_PRIVATE_FRAMEWORKS_DIR=$CROSS_PRIVATE_FRAMEWORKS if [ "x$MOZ_PKG_SPECIAL" != "xasan" -a -z "$MOZ_AUTOMATION_ARTIFACT_BUILDS" ]; then # Enable static analysis checks by default on OSX cross builds. diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index ff9c530fb8c8..daf9cb8bf5e3 100755 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -226,11 +226,11 @@ with only_when(target_is_osx): ) return value[0] - @depends(macos_private_frameworks) - def macos_private_frameworks(value): + @depends(macos_private_frameworks, macos_sdk) + def macos_private_frameworks(value, sdk): if value: return value - return "/System/Library/PrivateFrameworks" + return os.path.join(sdk or "/", "System/Library/PrivateFrameworks") set_config("MACOS_PRIVATE_FRAMEWORKS_DIR", macos_private_frameworks)