Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add macosx_deployment_target flag #12

Merged
merged 1 commit into from
Mar 10, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions python/lsst/sconsUtils/state.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ def _initVariables():
('baseversion', 'Specify the current base version', None),
('optFiles', "Specify a list of files that SHOULD be optimized", None),
('noOptFiles', "Specify a list of files that should NOT be optimized", None),
('macosx_deployment_target', 'Deployment target for Mac OS X', '10.9'),
)


Expand Down Expand Up @@ -174,6 +175,12 @@ def _initEnvironment():
env.Append(SHLINKFLAGS=["-Wl,-install_name", "-Wl,${TARGET.file}"])
if not re.search(r"-headerpad_max_install_names", str(env['SHLINKFLAGS'])):
env.Append(SHLINKFLAGS=["-Wl,-headerpad_max_install_names"])
#
# We want to be explicit about the OS X version we're targeting
#
env['ENV']['MACOSX_DEPLOYMENT_TARGET'] = env['macosx_deployment_target']
log.info("Setting OS X binary compatibility level: %s" % env['ENV']['MACOSX_DEPLOYMENT_TARGET'])

#
# Remove valid options from the arguments
#
Expand Down