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

py shim: xcrun must bring all original args #522

Merged
merged 1 commit into from
May 6, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion share/lib/python/scripts/_binwrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,17 @@
import sys
from pkg_resources import working_set
from distutils.ccompiler import new_compiler
from distutils.sysconfig import customize_compiler
from distutils.sysconfig import customize_compiler, get_config_var


def _set_default_compiler():
"""Set (dont overwrite) CC/CXX so that apps dont use the build-time ones"""
ccompiler = new_compiler()
customize_compiler(ccompiler)
# xcrun wrapper must bring all args
if ccompiler.compiler[0] == 'xcrun':
ccompiler.compiler[0] = get_config_var("CC")
ccompiler.compiler_cxx[0] = get_config_var("CXX")
os.environ.setdefault("CC", ccompiler.compiler[0])
os.environ.setdefault("CXX", ccompiler.compiler_cxx[0])

Expand Down