You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
54 lines
2.2 KiB
54 lines
2.2 KiB
3 years ago
|
diff --git a/setup.py b/setup.py
|
||
|
index f751107f..69bf39d4 100755
|
||
|
--- a/setup.py
|
||
|
+++ b/setup.py
|
||
|
@@ -293,7 +293,7 @@ def init_env(
|
||
|
df += ' -Og'
|
||
|
float_conversion = '-Wfloat-conversion'
|
||
|
fortify_source = '' if sanitize and is_macos else '-D_FORTIFY_SOURCE=2'
|
||
|
- optimize = df if debug or sanitize else '-O3'
|
||
|
+ optimize = ''
|
||
|
sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set()
|
||
|
cppflags_ = os.environ.get(
|
||
|
'OVERRIDE_CPPFLAGS', '-D{}DEBUG'.format('' if debug else 'N'),
|
||
|
@@ -308,8 +308,8 @@ def init_env(
|
||
|
cflags_ = os.environ.get(
|
||
|
'OVERRIDE_CFLAGS', (
|
||
|
f'-Wextra {float_conversion} -Wno-missing-field-initializers -Wall -Wstrict-prototypes {std}'
|
||
|
- f' -pedantic-errors {werror} {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}'
|
||
|
- f' -pipe {march} -fvisibility=hidden {fortify_source}'
|
||
|
+ f' -pedantic-errors {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}'
|
||
|
+ f' {march} -fvisibility=hidden {fortify_source}'
|
||
|
)
|
||
|
)
|
||
|
cflags = shlex.split(cflags_) + shlex.split(
|
||
|
@@ -317,7 +317,7 @@ def init_env(
|
||
|
)
|
||
|
ldflags_ = os.environ.get(
|
||
|
'OVERRIDE_LDFLAGS',
|
||
|
- '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3')
|
||
|
+ '-Wall ' + ' '.join(sanitize_args)
|
||
|
)
|
||
|
ldflags = shlex.split(ldflags_)
|
||
|
ldflags.append('-shared')
|
||
|
@@ -789,9 +789,7 @@ def safe_makedirs(path: str) -> None:
|
||
|
|
||
|
|
||
|
def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 'source') -> None:
|
||
|
- cflags = '-Wall -Werror -fpie'.split()
|
||
|
- if args.build_universal_binary:
|
||
|
- cflags += '-arch x86_64 -arch arm64'.split()
|
||
|
+ cflags = '-Wall -fpie'.split()
|
||
|
cppflags = []
|
||
|
libs: List[str] = []
|
||
|
if args.profile or args.sanitize:
|
||
|
@@ -803,8 +801,6 @@ def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 's
|
||
|
cflags.append('-g')
|
||
|
if args.profile:
|
||
|
libs.append('-lprofiler')
|
||
|
- else:
|
||
|
- cflags.append('-O3')
|
||
|
if bundle_type.endswith('-freeze'):
|
||
|
cppflags.append('-DFOR_BUNDLE')
|
||
|
cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version()))
|