8000 Backport gh-6243 by charris · Pull Request #6340 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

Backport gh-6243 #6340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 22, 2015
Merged

Backport gh-6243 #6340

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8bf83c4
Added closing for 'so_dup' and 'se_dup' file descriptors.
dmitrii-zagornyi Sep 14, 2015
7cba81b
MSVCCompiler overwrite 'lib' and 'include' environment variables. This
dmitrii-zagornyi Sep 14, 2015
c628401
Fixed issue: SciPy can't be build in case, if python was installed into
dmitrii-zagornyi Sep 14, 2015
ed6e960
Align with pep8
dmitrii-zagornyi Sep 14, 2015
4cc0dda
Changed from distutils_MSVCCompiler to
dmitrii-zagornyi Sep 14, 2015
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
Prev Previous commit
Changed from distutils_MSVCCompiler to 
distutils.msvccompiler.MSVCCompiler
  • Loading branch information
@dmitrii-zagornyi @charris
dmitrii-zagornyi authored and charris committed Sep 22, 2015
commit 4cc0dda4b3fee239a193badd1640717a03daeebc
15 changes: 8 additions & 7 deletions numpy/distutils/msvc9compiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
import os
from distutils.msvccompiler import *
from distutils.msvc9compiler import MSVCCompiler as distutils_MSVCCompiler
import distutils.msvc9compiler
from distutils.msvc9compiler import *


class MSVCCompiler(distutils_MSVCCompiler):
class MSVCCompiler(distutils.msvc9compiler.MSVCCompiler):
def __init__(self, verbose=0, dry_run=0, force=0):
distutils_MSVCCompiler.__init__(self, verbose, dry_run, force)
distutils.msvc9compiler.MSVCCompiler.__init__(self, verbose, dry_run, force)

def initialize(self, plat_name=None):
environ_lib = os.getenv('lib')
environ_include = os.getenv('include')
distutils_MSVCCompiler.initialize(self, plat_name)
distutils.msvc9compiler.MSVCCompiler.initialize(self, plat_name)
if environ_lib is not None:
os.environ['lib'] = environ_lib + os.environ['lib']
if environ_include is not None:
os.environ['include'] = environ_include + os.environ['include']

def manifest_setup_ldargs(self, output_filename, build_tem ACF3 p, ld_args):
ld_args.append('/MANIFEST')
distutils_MSVCCompiler.manifest_setup_ldargs(self, output_filename,
build_temp, ld_args)
distutils.msvc9compiler.MSVCCompiler.manifest_setup_ldargs(self,
output_filename,
build_temp, ld_args)
8 changes: 4 additions & 4 deletions numpy/distutils/msvccompiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import os
import distutils.msvccompiler
from distutils.msvccompiler import *
from distutils.msvccompiler import MSVCCompiler as distutils_MSVCCompiler


class MSVCCompiler(distutils_MSVCCompiler):
class MSVCCompiler(distutils.msvccompiler.MSVCCompiler):
def __init__(self, verbose=0, dry_run=0, force=0):
distutils_MSVCCompiler.__init__(self, verbose, dry_run, force)
distutils.msvccompiler.MSVCCompiler.__init__(self, verbose, dry_run, force)

def initialize(self, plat_name=None):
environ_lib = os.getenv('lib')
environ_include = os.getenv('include')
distutils_MSVCCompiler.initialize(self, plat_name)
distutils.msvccompiler.MSVCCompiler.initialize(self, plat_name)
if environ_lib is not None:
os.environ['lib'] = environ_lib + os.environ['lib']
if environ_include is not None:
Expand Down
0