Skip to content

Commit b7aad15

Browse files
authored
Merge pull request #472 from sass/remove-msvc-hack
remove msvc hack
2 parents e468db2 + 84abba3 commit b7aad15

File tree

2 files changed

+2
-21
lines changed

2 files changed

+2
-21
lines changed

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ jobs:
3232
main-linux:
3333
uses: asottile/workflows/.github/workflows/[email protected]
3434
with:
35-
env: '["pypy3", "py38", "py39", "py310", "py311"]'
35+
env: '["py38", "py39", "py310", "py311"]'
3636
os: ubuntu-latest
3737
submodules: true

setup.py

+1-20
Original file line numberDiff line numberDiff line change
@@ -96,26 +96,7 @@ def customize_compiler(compiler):
9696
elif filename.endswith('.h'):
9797
headers.append(filename)
9898

99-
if sys.platform == 'win32':
100-
from distutils.msvc9compiler import get_build_version
101-
vscomntools_env = 'VS{}{}COMNTOOLS'.format(
102-
int(get_build_version()),
103-
int(get_build_version() * 10) % 10,
104-
)
105-
try:
106-
os.environ[vscomntools_env] = os.environ['VS140COMNTOOLS']
107-
except KeyError:
108-
distutils.log.warn(
109-
'You probably need Visual Studio 2015 (14.0) '
110-
'or higher',
111-
)
112-
from distutils import msvccompiler, msvc9compiler
113-
if msvccompiler.get_build_version() < 14.0:
114-
msvccompiler.get_build_version = lambda: 14.0
115-
if get_build_version() < 14.0:
116-
msvc9compiler.get_build_version = lambda: 14.0
117-
msvc9compiler.VERSION = 14.0
118-
elif platform.system() in {'Darwin', 'FreeBSD', 'OpenBSD'}:
99+
if platform.system() in {'Darwin', 'FreeBSD', 'OpenBSD'}:
119100
# Dirty workaround to avoid link error...
120101
# Python distutils doesn't provide any way
121102
# to configure different flags for each cc and c++.

0 commit comments

Comments
 (0)