mirror of
https://github.com/codex-storage/deluge.git
synced 2025-02-17 22:06:27 +00:00
get rid of additions and rely on extra compile flag
This commit is contained in:
parent
8ee99ee9a1
commit
51eb0040e3
9
setup.py
9
setup.py
@ -99,7 +99,7 @@ if not OS == "win":
|
|||||||
EXTRA_COMPILE_ARGS = ["-Wno-missing-braces", "-DHAVE_INCLUDE_LIBTORRENT_ASIO____ASIO_HPP=1",
|
EXTRA_COMPILE_ARGS = ["-Wno-missing-braces", "-DHAVE_INCLUDE_LIBTORRENT_ASIO____ASIO_HPP=1",
|
||||||
"-DHAVE_INCLUDE_LIBTORRENT_ASIO_SSL_STREAM_HPP=1",
|
"-DHAVE_INCLUDE_LIBTORRENT_ASIO_SSL_STREAM_HPP=1",
|
||||||
"-DHAVE_INCLUDE_LIBTORRENT_ASIO_IP_TCP_HPP=1",
|
"-DHAVE_INCLUDE_LIBTORRENT_ASIO_IP_TCP_HPP=1",
|
||||||
"-DHAVE_PTHREAD=1", "-DTORRENT_USE_OPENSSL=1", "-DHAVE_SSL=1", "-DNDEBUG"]
|
"-DHAVE_PTHREAD=1", "-DTORRENT_USE_OPENSSL=1", "-DHAVE_SSL=1", "-DNDEBUG", "-O2"]
|
||||||
if ARCH == "x64":
|
if ARCH == "x64":
|
||||||
EXTRA_COMPILE_ARGS.append("-DAMD64")
|
EXTRA_COMPILE_ARGS.append("-DAMD64")
|
||||||
|
|
||||||
@ -116,22 +116,17 @@ if not OS == "win":
|
|||||||
boosttype = 'nomt'
|
boosttype = 'nomt'
|
||||||
else:
|
else:
|
||||||
boosttype = 'mt'
|
boosttype = 'mt'
|
||||||
removals = ['-g', '-Wstrict-prototypes']
|
removals = ['-DNDEBUG', '-g', '-Wstrict-prototypes']
|
||||||
additions = ['-DNDEBUG', '-O2']
|
|
||||||
|
|
||||||
if python_version == '2.5':
|
if python_version == '2.5':
|
||||||
cv_opt = sysconfig.get_config_vars()["CFLAGS"]
|
cv_opt = sysconfig.get_config_vars()["CFLAGS"]
|
||||||
for removal in removals:
|
for removal in removals:
|
||||||
cv_opt = cv_opt.replace(removal, " ")
|
cv_opt = cv_opt.replace(removal, " ")
|
||||||
for addition in additions:
|
|
||||||
cv_opt = cv_opt + " " + addition
|
|
||||||
sysconfig.get_config_vars()["CFLAGS"] = ' '.join(cv_opt.split())
|
sysconfig.get_config_vars()["CFLAGS"] = ' '.join(cv_opt.split())
|
||||||
else:
|
else:
|
||||||
cv_opt = sysconfig.get_config_vars()["OPT"]
|
cv_opt = sysconfig.get_config_vars()["OPT"]
|
||||||
for removal in removals:
|
for removal in removals:
|
||||||
cv_opt = cv_opt.replace(removal, " ")
|
cv_opt = cv_opt.replace(removal, " ")
|
||||||
for addition in additions:
|
|
||||||
cv_opt = cv_opt + " " + addition
|
|
||||||
sysconfig.get_config_vars()["OPT"] = ' '.join(cv_opt.split())
|
sysconfig.get_config_vars()["OPT"] = ' '.join(cv_opt.split())
|
||||||
else:
|
else:
|
||||||
boosttype = 'mt'
|
boosttype = 'mt'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user