diff options
| -rwxr-xr-x | bootstrap.py | 4 | ||||
| -rw-r--r-- | doc/manual.asciidoc | 6 | ||||
| -rw-r--r-- | src/ninja.cc | 1 |
3 files changed, 7 insertions, 4 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'] diff --git a/doc/manual.asciidoc b/doc/manual.asciidoc index ea26b8d..c23a3e3 100644 --- a/doc/manual.asciidoc +++ b/doc/manual.asciidoc @@ -397,7 +397,7 @@ rule cc # If left unspecified, builds get the outer $cflags. build foo.o: cc foo.c -# But you can can shadow variables like cflags for a particular build. +# But you can shadow variables like cflags for a particular build. build special.o: cc special.c cflags = -Wall @@ -634,7 +634,7 @@ across a line break). paths, where a space would otherwise separate filenames. See below.) `$:` :: a colon. (This is only necessary in `build` lines, where a colon -would otherwise terminate the list of inputs.) +would otherwise terminate the list of outputs.) `$$`:: a literal `$`. @@ -674,7 +674,7 @@ Two variables are significant when declared in the outermost file scope. discussion of the build log>>. (You can also store other build output in this directory.) -`ninja_required_version`:: the minimum verison of Ninja required to process +`ninja_required_version`:: the minimum version of Ninja required to process the build correctly. See <<ref_versioning,the discussion of versioning>>. diff --git a/src/ninja.cc b/src/ninja.cc index c6a3500..b24ac33 100644 --- a/src/ninja.cc +++ b/src/ninja.cc @@ -15,6 +15,7 @@ #include <errno.h> #include <limits.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <sys/stat.h> #include <sys/types.h> |