From ca6f2b060c91b30b564db0b541f4c17c3deedbd3 Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Tue, 16 Oct 2018 09:54:28 -0700 Subject: [PATCH] Use -lc++ on macos too --- setup.py | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/setup.py b/setup.py index a5734f07..89d350db 100644 --- a/setup.py +++ b/setup.py @@ -51,6 +51,13 @@ def _maybe_macos(flags): ) +if sys.platform == 'win32': + extra_link_args = [] +elif platform.system() in {'Darwin', 'FreeBSD'}: + extra_link_args = ['-fPIC', '-lc++'] +else: + extra_link_args = ['-fPIC', '-lstdc++'] + if system_sass: flags = [ '-fPIC', '-std=gnu++0x', '-Wall', '-Wno-parentheses', '-Werror=switch', @@ -58,14 +65,9 @@ def _maybe_macos(flags): _maybe_clang(flags) _maybe_macos(flags) - if platform.system() == 'FreeBSD': - link_flags = ['-fPIC', '-lc++'] - else: - link_flags = ['-fPIC', '-lstdc++'] libraries = ['sass'] include_dirs = [] extra_compile_args = flags - extra_link_args = link_flags else: LIBSASS_SOURCE_DIR = os.path.join('libsass', 'src') @@ -136,7 +138,6 @@ def _maybe_macos(flags): msvc9compiler.get_build_version = lambda: 14.0 msvc9compiler.VERSION = 14.0 flags = ['/Od', '/EHsc', '/MT'] - link_flags = [] else: flags = [ '-fPIC', '-std=gnu++0x', '-Wall', @@ -172,15 +173,9 @@ def restore_cencode(): with open(cencode_path, 'w') as f: f.write(cencode_body) - if platform.system() == 'FreeBSD': - link_flags = ['-fPIC', '-lc++'] - else: - link_flags = ['-fPIC', '-lstdc++'] - libraries = [] include_dirs = [os.path.join('.', 'libsass', 'include')] extra_compile_args = flags + [version_define] - extra_link_args = link_flags sass_extension = Extension( '_sass', @@ -188,7 +183,7 @@ def restore_cencode(): include_dirs=include_dirs, depends=headers, extra_compile_args=extra_compile_args, - extra_link_args=link_flags, + extra_link_args=extra_link_args, libraries=libraries, ) pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy