Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 17 Mar 2021 10:27:46 GMT
From:      Alex Richardson <arichardson@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: c437c2b136f2 - stable/13 - tools/build/make.py: -DNO_CLEAN -> -DWITHOUT_CLEAN
Message-ID:  <202103171027.12HARklj096067@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by arichardson:

URL: https://cgit.FreeBSD.org/src/commit/?id=c437c2b136f20dbed6480d1dd01a6b28cfea4570

commit c437c2b136f20dbed6480d1dd01a6b28cfea4570
Author:     Alex Richardson <arichardson@FreeBSD.org>
AuthorDate: 2021-02-03 15:56:03 +0000
Commit:     Alex Richardson <arichardson@FreeBSD.org>
CommitDate: 2021-03-17 09:56:18 +0000

    tools/build/make.py: -DNO_CLEAN -> -DWITHOUT_CLEAN
    
    (cherry picked from commit 43e083be8103685e65582e002d33e861f7d5c794)
---
 tools/build/make.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/build/make.py b/tools/build/make.py
index 146d4a7b6d47..e692fef11e05 100755
--- a/tools/build/make.py
+++ b/tools/build/make.py
@@ -154,10 +154,10 @@ if __name__ == "__main__":
                         help="Print information on inferred env vars")
     parser.add_argument("--clean", action="store_true",
                         help="Do a clean rebuild instead of building with "
-                             "-DNO_CLEAN")
+                             "-DWITHOUT_CLEAN")
     parser.add_argument("--no-clean", action="store_false", dest="clean",
                         help="Do a clean rebuild instead of building with "
-                             "-DNO_CLEAN")
+                             "-DWITHOUT_CLEAN")
     try:
         import argcomplete  # bash completion:
 
@@ -250,10 +250,10 @@ if __name__ == "__main__":
             and not is_make_var_set("WITHOUT_CLEAN")):
         # Avoid accidentally deleting all of the build tree and wasting lots of
         # time cleaning directories instead of just doing a rm -rf ${.OBJDIR}
-        want_clean = input("You did not set -DNO_CLEAN/--clean/--no-clean."
-                           " Did you really mean to do a  clean build? y/[N] ")
+        want_clean = input("You did not set -DWITHOUT_CLEAN/--clean/--no-clean."
+                           " Did you really mean to do a clean build? y/[N] ")
         if not want_clean.lower().startswith("y"):
-            bmake_args.append("-DNO_CLEAN")
+            bmake_args.append("-DWITHOUT_CLEAN")
 
     env_cmd_str = " ".join(
         shlex.quote(k + "=" + v) for k, v in new_env_vars.items())



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103171027.12HARklj096067>