From 1f697d27ffc2796638157df85ffd7bb3417118cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@digia.com>
Date: Tue, 2 Sep 2014 16:49:27 +0200
Subject: [PATCH] <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: Zeno Albisser <zeno.albisser@digia.com>
---
ninja/bootstrap.py | 8 --------
1 file changed, 8 deletions(-)
diff --git a/ninja/bootstrap.py b/ninja/bootstrap.py
index 026396b5c36..c747867c94e 100755
--- a/ninja/bootstrap.py
+++ b/ninja/bootstrap.py
@@ -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++'))
--
GitLab