diff options
| author | Michelle McDaniel <adiaaida@gmail.com> | 2016-08-19 15:35:25 -0700 |
|---|---|---|
| committer | Michelle McDaniel <adiaaida@gmail.com> | 2016-08-24 14:03:44 -0700 |
| commit | 7d53e9b49c3cb0802f2cd8542c1f54ec6cd38612 (patch) | |
| tree | 36887f24eaf30732c067ed6ea3880ab2055bea81 /src/pal/tools | |
| parent | 158db015291e012bb79c6eba15718834cb4ae173 (diff) | |
| download | coreclr-7d53e9b49c3cb0802f2cd8542c1f54ec6cd38612.tar.gz coreclr-7d53e9b49c3cb0802f2cd8542c1f54ec6cd38612.tar.bz2 coreclr-7d53e9b49c3cb0802f2cd8542c1f54ec6cd38612.zip | |
Update build to optionally configure with nmake
For formatting, we want to be able to obtain the compile_commands.json
file so that we do not have to 1) do a full build of coreclr and 2)
generate it ourselves from the build log. This change modifies build.cmd
to take an option "usenmakemakefiles." This option will set
__NMakeMakefiles to 1, which is used by the gen-buildsys-win.bat script.
This option also sets all the same options as configureonly, as we cannot
do a full build using NMake Makefiles, and we only want to use this to
force CMake to generate a compile_commands.json file for the jit
directory, which it can do using NMake Makefiles, but not Visual Studio.
The update to gen-buildsys-win.bat checks the value of __NMakeMakefiles,
and if it is set to 1, it sets the CMake Generator to NMake Makefiles.
Diffstat (limited to 'src/pal/tools')
| -rw-r--r-- | src/pal/tools/gen-buildsys-win.bat | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/pal/tools/gen-buildsys-win.bat b/src/pal/tools/gen-buildsys-win.bat index 3e9e4c24c5..41a7545c5a 100644 --- a/src/pal/tools/gen-buildsys-win.bat +++ b/src/pal/tools/gen-buildsys-win.bat @@ -24,6 +24,8 @@ if /i "%__Arch%" == "x64" (set __CmakeGenerator=%__CmakeGenerator% Win64) if /i "%__Arch%" == "arm64" (set __CmakeGenerator=%__CmakeGenerator% Win64) if /i "%__Arch%" == "arm" (set __CmakeGenerator=%__CmakeGenerator% ARM) +if /i "%__NMakeMakefiles%" == "1" (set __CmakeGenerator=NMake Makefiles) + :loop if [%4] == [] goto end_loop set __ExtraCmakeParams=%__ExtraCmakeParams% %4 |