Skip to content

Commit

Permalink
Merge pull request #472 from sass/remove-msvc-hack
Browse files Browse the repository at this point in the history
remove msvc hack
  • Loading branch information
asottile authored Oct 26, 2024
2 parents e468db2 + 84abba3 commit b7aad15
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ jobs:
main-linux:
uses: asottile/workflows/.github/workflows/[email protected]
with:
env: '["pypy3", "py38", "py39", "py310", "py311"]'
env: '["py38", "py39", "py310", "py311"]'
os: ubuntu-latest
submodules: true
21 changes: 1 addition & 20 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,26 +96,7 @@ def customize_compiler(compiler):
elif filename.endswith('.h'):
headers.append(filename)

if sys.platform == 'win32':
from distutils.msvc9compiler import get_build_version
vscomntools_env = 'VS{}{}COMNTOOLS'.format(
int(get_build_version()),
int(get_build_version() * 10) % 10,
)
try:
os.environ[vscomntools_env] = os.environ['VS140COMNTOOLS']
except KeyError:
distutils.log.warn(
'You probably need Visual Studio 2015 (14.0) '
'or higher',
)
from distutils import msvccompiler, msvc9compiler
if msvccompiler.get_build_version() < 14.0:
msvccompiler.get_build_version = lambda: 14.0
if get_build_version() < 14.0:
msvc9compiler.get_build_version = lambda: 14.0
msvc9compiler.VERSION = 14.0
elif platform.system() in {'Darwin', 'FreeBSD', 'OpenBSD'}:
if platform.system() in {'Darwin', 'FreeBSD', 'OpenBSD'}:
# Dirty workaround to avoid link error...
# Python distutils doesn't provide any way
# to configure different flags for each cc and c++.
Expand Down

0 comments on commit b7aad15

Please sign in to comment.