Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "sanitycheck: Default to using Ninja" #6479

Merged
merged 1 commit into from
Mar 20, 2018
+6 −11
Merged

Revert "sanitycheck: Default to using Ninja" #6479

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions scripts/sanitycheck
View file
Open in desktop
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