Skip to content

Commit

Permalink
Revert "sanitycheck: Default to using Ninja"
Browse files Browse the repository at this point in the history
This reverts commit 0e6689d.

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

See ninja-build/ninja#1139

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
  • Loading branch information
nashif committed Mar 6, 2018
1 parent 02bc5fa commit bc61319
Showing 1 changed file with 6 additions and 11 deletions.
17 changes: 6 additions & 11 deletions scripts/sanitycheck
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit bc61319

Please sign in to comment.