patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

Revert "sanitycheck: Default to using Ninja"

Browse source 
This reverts commit 0e6689d559.

Parallel builds are broken due to a mix of Make/Ninja and the job server
not being operational.

See https://github.com/ninja-build/ninja/issues/1139

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2018-03-06 07:15:11 -06:00 committed by Anas Nashif
parent 3a6d72ecde
commit 25f6ab62c7
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
scripts/sanitycheck
View file

@ -830,14 +830,14 @@ class MakeGenerator:
if not "native_posix" in args:
ldflags="-Wl,--fatal-warnings"
if options.make:
generator = "Unix Makefiles"
generator_cmd = "$(MAKE)"
verb = "VERBOSE=1" if VERBOSE else "VERBOSE=0"
else:
if options.ninja:
generator = "Ninja"
generator_cmd = "ninja"
verb = "-v" if VERBOSE else ""
else:
generator = "Unix Makefiles"
generator_cmd = "$(MAKE)"
verb = "VERBOSE=1" if VERBOSE else "VERBOSE=0"
return MakeGenerator.MAKE_RULE_TMPL.format(
generator=generator,
@ -2099,12 +2099,7 @@ def parse_arguments():
parser.add_argument(
"-N", "--ninja", action="store_true",
help="Use the Ninja generator with CMake. "
"This option is deprecated as Ninja is now the default.")
parser.add_argument(
"-M", "--make", action="store_true",
help="Use the 'Unix Makefiles' generator with CMake")
help="Use the Ninja generator with CMake")
parser.add_argument(
"-y", "--dry-run", action="store_true",