Unverified Commit bedb49f0 authored by Scott Cyphers's avatar Scott Cyphers Committed by GitHub

Merge branch 'r0.23' into gauri/macos_cast_r023

parents e239c526 0a4b3e33
...@@ -326,6 +326,7 @@ def add_platform_specific_link_args(link_args): ...@@ -326,6 +326,7 @@ def add_platform_specific_link_args(link_args):
link_args += ['-z', 'now'] link_args += ['-z', 'now']
elif sys.platform == 'darwin': elif sys.platform == 'darwin':
link_args += ['-Wl,-rpath,@loader_path/../..'] link_args += ['-Wl,-rpath,@loader_path/../..']
link_args += ['-stdlib=libc++']
class BuildExt(build_ext): class BuildExt(build_ext):
...@@ -360,6 +361,8 @@ class BuildExt(build_ext): ...@@ -360,6 +361,8 @@ class BuildExt(build_ext):
ext.extra_compile_args += ['-Wformat', '-Wformat-security'] ext.extra_compile_args += ['-Wformat', '-Wformat-security']
ext.extra_compile_args += ['-O2', '-D_FORTIFY_SOURCE=2'] ext.extra_compile_args += ['-O2', '-D_FORTIFY_SOURCE=2']
if sys.platform == 'darwin':
ext.extra_compile_args += ['-stdlib=libc++']
build_ext.build_extensions(self) build_ext.build_extensions(self)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment