Author: Matti Picus <[email protected]>
Branch:
Changeset: r73827:63b7ea1c8c2d
Date: 2014-10-06 18:27 +0300
http://bitbucket.org/pypy/pypy/changeset/63b7ea1c8c2d/
Log: fix msvc compiler choice override from CC environment variable
diff --git a/rpython/translator/platform/__init__.py
b/rpython/translator/platform/__init__.py
--- a/rpython/translator/platform/__init__.py
+++ b/rpython/translator/platform/__init__.py
@@ -354,8 +354,10 @@
platform = pick_platform(new_platform, cc)
if not platform:
raise ValueError("pick_platform(%r, %s) failed"%(new_platform, cc))
- log.msg("Set platform with %r cc=%s, using cc=%r" % (new_platform, cc,
- getattr(platform, 'cc','Unknown')))
+ log.msg("Set platform with %r cc=%s, using cc=%r, version=%r" %
(new_platform, cc,
+ getattr(platform, 'cc','Unknown'),
+ getattr(platform, 'version','Unknown'),
+ ))
if new_platform == 'host':
global host
diff --git a/rpython/translator/platform/windows.py
b/rpython/translator/platform/windows.py
--- a/rpython/translator/platform/windows.py
+++ b/rpython/translator/platform/windows.py
@@ -14,9 +14,11 @@
if not cc:
cc = os.environ.get('CC','')
if not cc:
- return MsvcPlatform(cc=cc, x64=x64_flag)
+ return MsvcPlatform(x64=x64_flag)
elif cc.startswith('mingw') or cc == 'gcc':
return MingwPlatform(cc)
+ else:
+ return MsvcPlatform(cc=cc, x64=x64_flag)
try:
subprocess.check_output([cc, '--version'])
except:
@@ -108,11 +110,14 @@
def __init__(self, cc=None, x64=False):
self.x64 = x64
- msvc_compiler_environ = find_msvc_env(x64)
- Platform.__init__(self, 'cl.exe')
- if msvc_compiler_environ:
- self.c_environ = os.environ.copy()
- self.c_environ.update(msvc_compiler_environ)
+ if cc is None:
+ msvc_compiler_environ = find_msvc_env(x64)
+ Platform.__init__(self, 'cl.exe')
+ if msvc_compiler_environ:
+ self.c_environ = os.environ.copy()
+ self.c_environ.update(msvc_compiler_environ)
+ else:
+ self.cc = cc
# detect version of current compiler
returncode, stdout, stderr = _run_subprocess(self.cc, '',
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
