diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2021-10-21 14:10:20 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-21 14:10:20 -0600 |
| commit | 7f61ddbf04e89ba78769c93472df8455b38111b9 (patch) | |
| tree | 9d7a88f5a742614660d8bd000089e19973c876f9 | |
| parent | 76f1edbe09f45e701544498aad2251215aa51c97 (diff) | |
| parent | c72fbd00ffc5439cc7def96456c391ef64237886 (diff) | |
| download | numpy-7f61ddbf04e89ba78769c93472df8455b38111b9.tar.gz | |
Merge pull request #20155 from matthew-brett/fix-mscver-version
MRG: Distuils patch to allow for 2 as a minor version (!)
| -rw-r--r-- | numpy/distutils/mingw32ccompiler.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/numpy/distutils/mingw32ccompiler.py b/numpy/distutils/mingw32ccompiler.py index 541055899..c3a0cb418 100644 --- a/numpy/distutils/mingw32ccompiler.py +++ b/numpy/distutils/mingw32ccompiler.py @@ -647,10 +647,9 @@ def generate_manifest(config): if msver is not None: if msver >= 8: check_embedded_msvcr_match_linked(msver) - ma = int(msver) - mi = int((msver - ma) * 10) + ma_str, mi_str = str(msver).split('.') # Write the manifest file - manxml = msvc_manifest_xml(ma, mi) + manxml = msvc_manifest_xml(int(ma_str), int(mi_str)) with open(manifest_name(config), "w") as man: config.temp_files.append(manifest_name(config)) man.write(manxml) |