KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix #475

Browse Source
This commit is contained in:
Kovid Goyal 2018-04-20 20:32:16 +05:30
parent 784894cac3
commit 5eee7ce338
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
setup.py
View File

@ -13,6 +13,7 @@ import shutil
import subprocess import subprocess
import sys import sys
import sysconfig import sysconfig
import tempfile
import time import time
base = os.path.dirname(os.path.abspath(__file__)) base = os.path.dirname(os.path.abspath(__file__))
@ -140,6 +141,13 @@ def get_sanitize_args(cc, ccver):
return sanitize_args return sanitize_args
def test_compile(cc, *cflags):
with tempfile.NamedTemporaryFile(suffix='.c') as f:
f.write(b'int main(void) { return 0; }')
f.flush()
return subprocess.Popen([cc] + list(cflags) + [f.name, '-o', os.devnull]).wait() == 0
class Env: class Env:
def __init__(self, cc, cppflags, cflags, ldflags, ldpaths=[]): def __init__(self, cc, cppflags, cflags, ldflags, ldpaths=[]):
@ -155,9 +163,12 @@ def init_env(
native_optimizations = native_optimizations and not sanitize and not debug native_optimizations = native_optimizations and not sanitize and not debug
cc, ccver = cc_version() cc, ccver = cc_version()
print('CC:', cc, ccver) print('CC:', cc, ccver)
if test_compile(cc, '-fstack-protector-strong'):
stack_protector = '-fstack-protector-strong'
elif test_compile(cc, '-fstack-protector'):
stack_protector = '-fstack-protector' stack_protector = '-fstack-protector'
if ccver >= (4, 9) and cc == 'gcc': else:
stack_protector += '-strong' stack_protector = ''
missing_braces = '' missing_braces = ''
if ccver < (5, 2) and cc == 'gcc': if ccver < (5, 2) and cc == 'gcc':
missing_braces = '-Wno-missing-braces' missing_braces = '-Wno-missing-braces'