mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-25 01:38:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup compiler flags a little

Browse Source
This commit is contained in:
Kovid Goyal
2017-11-01 14:35:57 +05:30
parent 21ed07d7ce
commit d9ff3bce72
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
setup.py
View File

@@ -89,13 +89,12 @@ def get_python_flags(cflags):
def get_sanitize_args(cc, ccver): def get_sanitize_args(cc, ccver):
sanitize_args = set() sanitize_args = ['-fsanitize=address']
sanitize_args.add('-fno-omit-frame-pointer')
sanitize_args.add('-fsanitize=address')
if (cc == 'gcc' and ccver >= (5, 0)) or cc == 'clang': if (cc == 'gcc' and ccver >= (5, 0)) or cc == 'clang':
sanitize_args.add('-fsanitize=undefined') sanitize_args.append('-fsanitize=undefined')
# if cc == 'gcc' or (cc == 'clang' and ccver >= (4, 2)): # if cc == 'gcc' or (cc == 'clang' and ccver >= (4, 2)):
# sanitize_args.add('-fno-sanitize-recover=all') # sanitize_args.append('-fno-sanitize-recover=all')
sanitize_args.append('-fno-omit-frame-pointer')
return sanitize_args return sanitize_args
@@ -110,7 +109,7 @@ def init_env(debug=False, sanitize=False, native_optimizations=True, profile=Fal
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'
optimize = '-ggdb' if debug or sanitize else '-O3' optimize = '-g3' if debug or sanitize else '-O3'
sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set() sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set()
cflags = os.environ.get( cflags = os.environ.get(
'OVERRIDE_CFLAGS', ( 'OVERRIDE_CFLAGS', (
@@ -129,12 +128,13 @@ def init_env(debug=False, sanitize=False, native_optimizations=True, profile=Fal
ldflags = shlex.split(ldflags) ldflags = shlex.split(ldflags)
cflags += shlex.split(os.environ.get('CFLAGS', '')) cflags += shlex.split(os.environ.get('CFLAGS', ''))
ldflags += shlex.split(os.environ.get('LDFLAGS', '')) ldflags += shlex.split(os.environ.get('LDFLAGS', ''))
if not debug: if not debug and not sanitize:
# See https://github.com/google/sanitizers/issues/647
cflags.append('-flto'), ldflags.append('-flto') cflags.append('-flto'), ldflags.append('-flto')
if profile: if profile:
cflags.append('-DWITH_PROFILER') cflags.append('-DWITH_PROFILER')
cflags.append('-g') cflags.append('-g3')
ldflags.append('-lprofiler') ldflags.append('-lprofiler')
cflags.append('-pthread') cflags.append('-pthread')
# We add 4000 to the primary version because vim turns on SGR mouse mode # We add 4000 to the primary version because vim turns on SGR mouse mode
@@ -339,7 +339,7 @@ def build_asan_launcher(args):
if args.incremental and not newer(dest, src): if args.incremental and not newer(dest, src):
return return
cc, ccver = cc_version() cc, ccver = cc_version()
cflags = '-g -Wall -Werror -fpie -std=c99'.split() cflags = '-g3 -Wall -Werror -fpie -std=c99'.split()
pylib = get_python_flags(cflags) pylib = get_python_flags(cflags)
sanitize_lib = ['-lasan'] if cc == 'gcc' and not isosx else [] sanitize_lib = ['-lasan'] if cc == 'gcc' and not isosx else []
cflags.extend(get_sanitize_args(cc, ccver)) cflags.extend(get_sanitize_args(cc, ccver))