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

DRYer

Browse Source
This commit is contained in:
Kovid Goyal
2018-04-20 20:56:29 +05:30
parent 5eee7ce338
commit 23077fd6a6
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
setup.py
View File

@@ -148,6 +148,13 @@ def test_compile(cc, *cflags):
return subprocess.Popen([cc] + list(cflags) + [f.name, '-o', os.devnull]).wait() == 0 return subprocess.Popen([cc] + list(cflags) + [f.name, '-o', os.devnull]).wait() == 0
def first_successful_compile(cc, *cflags):
for x in cflags:
if test_compile(cc, *shlex.split(x)):
return x
return ''
class Env: class Env:
def __init__(self, cc, cppflags, cflags, ldflags, ldpaths=[]): def __init__(self, cc, cppflags, cflags, ldflags, ldpaths=[]):
@@ -163,12 +170,7 @@ 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 = first_successful_compile(cc, '-fstack-protector-strong', '-fstack-protector')
stack_protector = '-fstack-protector-strong'
elif test_compile(cc, '-fstack-protector'):
stack_protector = '-fstack-protector'
else:
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'