Skip to content

Commit

Permalink
[omnibus] Target MacOS 10.12 when building on MacOS (#5067)
Browse files Browse the repository at this point in the history
Sets MACOSX_DEPLOYMENT_TARGET to 10.12 for the whole omnibus build to make sure we only use symbols available on 10.12.
  • Loading branch information
KSerrania authored Mar 5, 2020
1 parent d294af3 commit 28451a9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 1 addition & 2 deletions omnibus/config/software/python2.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@
"--with-universal-archs=intel",
"--enable-shared",
"--without-gcc",
"CC=clang",
"MACOSX_DEPLOYMENT_TARGET=10.12")
"CC=clang")
elsif linux?
python_configure.push("--enable-unicode=ucs4",
"--enable-shared")
Expand Down
4 changes: 4 additions & 0 deletions tasks/agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,10 @@ def omnibus_build(ctx, puppy=False, agent_binaries=False, log_level="info", base
env['SIGN_PFX'] = "{}".format(pfxfile)
env['SIGN_PFX_PW'] = "{}".format(pfxpass)

if sys.platform == 'darwin':
# Target MacOS 10.12
env['MACOSX_DEPLOYMENT_TARGET'] = '10.12'

if omnibus_s3_cache:
args['populate_s3_cache'] = " --populate-s3-cache "
if skip_sign:
Expand Down

0 comments on commit 28451a9

Please sign in to comment.