Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-01 13:57:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1513798 - Automatically set -syslibroot for OSX cross-builds from configure. r=nalexander

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D14384
This commit is contained in:
Mike Hommey 2018-12-13 17:01:23 +09:00
parent e580fcbf31
commit 7f87f1f891
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/macosx/cross-mozconfig.common
View File

@ -24,7 +24,6 @@ CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks
export CC="$topsrcdir/clang/bin/clang"
export CXX="$topsrcdir/clang/bin/clang++"
export LLVMCONFIG=$topsrcdir/clang/bin/llvm-config
export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT"
export BINDGEN_CFLAGS="-isysroot $CROSS_SYSROOT"
export DSYMUTIL=$topsrcdir/build/macosx/llvm-dsymutil
mk_add_options "export REAL_DSYMUTIL=$topsrcdir/llvm-dsymutil/bin/dsymutil"

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

@ -1892,7 +1892,21 @@ def select_linker(linker, c_compiler, developer_options, enable_gold,
set_config('LINKER_KIND', select_linker.KIND)
add_old_configure_assignment('LINKER_LDFLAGS', select_linker.LINKER_FLAG)
@depends_if(select_linker, macos_sdk)
def linker_ldflags(linker, macos_sdk):
flags = list(linker.LINKER_FLAG or [])
if macos_sdk:
if linker.KIND == 'ld64':
flags.append('-Wl,-syslibroot,%s' % macos_sdk)
else:
flags.append('-Wl,--sysroot=%s' % macos_sdk)
return flags
add_old_configure_assignment('LINKER_LDFLAGS', linker_ldflags)
# There's a wrinkle with MinGW: linker configuration is not enabled, so