Commit 1f697d27 authored by Michael Brüning's avatar Michael Brüning Committed by Zeno Albisser
Browse files

<ninja> Let ninja use the Visual C++ binary from PATH


The previous logic led to problems when running 64 bit
builds in a native 64 bit shell as the cross compiler
was always given priority.

Change-Id: Id6a29147c461e8542f65a568ff5956d4fdb3c642
Reviewed-by: default avatarZeno Albisser <zeno.albisser@digia.com>
parent 90056240
Tags
No related merge requests found
Showing with 0 additions and 8 deletions
......@@ -93,14 +93,6 @@ if platform.is_windows():
if platform.is_msvc():
cl = 'cl'
vcdir = os.environ.get('VCINSTALLDIR')
if vcdir:
if options.x64:
cl = os.path.join(vcdir, 'bin', 'x86_amd64', 'cl.exe')
if not os.path.exists(cl):
cl = os.path.join(vcdir, 'bin', 'amd64', 'cl.exe')
else:
cl = os.path.join(vcdir, 'bin', 'cl.exe')
args = [cl, '/nologo', '/EHsc', '/DNOMINMAX']
else:
args = shlex.split(os.environ.get('CXX', 'g++'))
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment