unnest disable-platform-guessing code

This commit is contained in:
wiredfool 2016-05-01 10:57:50 +01:00
parent ce2bb05a2b
commit d7f2698718

View File

@ -224,7 +224,10 @@ class pil_build_ext(build_ext):
# #
# add platform directories # add platform directories
if sys.platform == "cygwin": if self.disable_platform_guessing:
pass
elif sys.platform == "cygwin":
# pythonX.Y.dll.a is in the /usr/lib/pythonX.Y/config directory # pythonX.Y.dll.a is in the /usr/lib/pythonX.Y/config directory
_add_directory(library_dirs, _add_directory(library_dirs,
os.path.join("/usr/lib", "python%s" % os.path.join("/usr/lib", "python%s" %
@ -270,9 +273,6 @@ class pil_build_ext(build_ext):
_add_directory(include_dirs, "/usr/X11/include") _add_directory(include_dirs, "/usr/X11/include")
elif sys.platform.startswith("linux"): elif sys.platform.startswith("linux"):
if self.disable_platform_guessing:
pass
else:
arch_tp = (plat.processor(), plat.architecture()[0]) arch_tp = (plat.processor(), plat.architecture()[0])
if arch_tp == ("x86_64", "32bit"): if arch_tp == ("x86_64", "32bit"):
# 32-bit build on 64-bit machine. # 32-bit build on 64-bit machine.