Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 3 additions & 15 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
#
import sys, os
from warnings import warn
from distutils import log
from distutils.command.build_ext import build_ext as _build_ext
from setuptools._distutils import log
from setuptools.command.build_ext import build_ext as _build_ext
from version import get_git_version

try:
Expand Down Expand Up @@ -88,14 +88,6 @@ def __new__(cls, s):
'win32',
)

if IS_WINDOWS:
# don't try to import MSVC compiler on non-windows platforms
# as this triggers unnecessary warnings
from distutils.msvccompiler import MSVCCompiler
else:
class MSVCCompiler(object):
# dummy marker class
pass

class build_ext(_build_ext):

Expand All @@ -119,7 +111,7 @@ def build_extension(self, ext):
else:
ext.define_macros.append(('_7ZIP_ST', 1))

if isinstance(self.compiler, MSVCCompiler):
if getattr(self.compiler, "compiler_type", "") == "msvc":
# set flags only available when using MSVC
ext.extra_link_args.append('/MANIFEST')
if COMPILE_DEBUG:
Expand Down Expand Up @@ -152,20 +144,16 @@ def build_extension(self, ext):
lzma_files = (
'src/sdk/C/Aes.c',
'src/sdk/C/AesOpt.c',
'src/sdk/C/Bcj2.c',
'src/sdk/C/Bra.c',
'src/sdk/C/Bra86.c',
'src/sdk/C/BraIA64.c',
'src/sdk/C/CpuArch.c',
'src/sdk/C/Delta.c',
'src/sdk/C/LzFind.c',
'src/sdk/C/LzmaDec.c',
'src/sdk/C/LzmaEnc.c',
'src/sdk/C/Lzma2Dec.c',
'src/sdk/C/Lzma2Enc.c',
'src/sdk/C/Sha256.c',
'src/sdk/C/Ppmd7.c',
'src/sdk/C/Ppmd7Dec.c',
)
if ENABLE_COMPATIBILITY:
c_files += (
Expand Down