Skip to content

Commit

Permalink
Add a check for the VC++ 2012-style 64-bit path.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
benvanik committed Feb 20, 2013
1 parent e758e8d commit 5f36d10
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,9 @@ def run(*args, **kwargs):
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']
Expand Down

0 comments on commit 5f36d10

Please sign in to comment.