diff options
| author | Ben Vanik <ben.vanik@gmail.com> | 2013-02-20 06:28:26 (GMT) |
|---|---|---|
| committer | Ben Vanik <ben.vanik@gmail.com> | 2013-02-20 06:28:26 (GMT) |
| commit | 5f36d1047186d02905530c66ce6a21c5a245a813 (patch) | |
| tree | 0ae7952fed8e21ce4a453fede6567e345ee4e3cc /bootstrap.py | |
| parent | e758e8d0e014c1442ab5973541a3a1cc59dc97cb (diff) | |
| download | Ninja-5f36d1047186d02905530c66ce6a21c5a245a813.zip Ninja-5f36d1047186d02905530c66ce6a21c5a245a813.tar.gz Ninja-5f36d1047186d02905530c66ce6a21c5a245a813.tar.bz2 | |
Add a check for the VC++ 2012-style 64-bit path.
In VS2012 the path to the 64-bit tools has changed to
VCINSTALLDIR\bin\x86_amd64\cl.exe. This change will make the bootstrap
check there to see if it exists before falling back to the old amd64 path.
Diffstat (limited to 'bootstrap.py')
| -rwxr-xr-x | bootstrap.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bootstrap.py b/bootstrap.py index 331ea0f..fcf1a20 100755 --- a/bootstrap.py +++ b/bootstrap.py @@ -85,7 +85,9 @@ if options.windows: vcdir = os.environ.get('VCINSTALLDIR') if vcdir: if options.x64: - cl = [os.path.join(vcdir, 'bin', 'amd64', 'cl.exe')] + cl = [os.path.join(vcdir, 'bin', 'x86_amd64', 'cl.exe')] + if not os.path.exists(cl[0]): + cl = [os.path.join(vcdir, 'bin', 'amd64', 'cl.exe')] else: cl = [os.path.join(vcdir, 'bin', 'cl.exe')] args = cl + ['/nologo', '/EHsc', '/DNOMINMAX'] |