From 25b3530c4ee08c456e9784a8d5848b8aa368c681 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Tue, 13 Jun 2023 18:14:36 +0200 Subject: [PATCH] Remove --no-crossdirect argument With an upcoming patch to remove the legacy distcc code, the --no-crossdirect argument would do the same as --no-cross: perform the build entirely in qemu. So remove the argument. I doubt anybody was using it anyway. Reviewed-by: Luca Weiss Reviewed-by: Clayton Craft Link: https://lists.sr.ht/~postmarketos/pmbootstrap-devel/%3C20230613161437.570196-3-ollieparanoid@postmarketos.org%3E --- pmb/build/autodetect.py | 2 +- pmb/parse/arguments.py | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pmb/build/autodetect.py b/pmb/build/autodetect.py index ad2a2b9b..f6edc063 100644 --- a/pmb/build/autodetect.py +++ b/pmb/build/autodetect.py @@ -90,6 +90,6 @@ def crosscompile(args, apkbuild, arch, suffix): return None if suffix == "native": return "native" - if args.no_crossdirect or "!pmb:crossdirect" in apkbuild["options"]: + if "!pmb:crossdirect" in apkbuild["options"]: return "distcc" return "crossdirect" diff --git a/pmb/parse/arguments.py b/pmb/parse/arguments.py index c584afb8..9454483c 100644 --- a/pmb/parse/arguments.py +++ b/pmb/parse/arguments.py @@ -652,12 +652,6 @@ def arguments(): # Compiler parser.add_argument("--no-ccache", action="store_false", dest="ccache", help="do not cache the compiled output") - parser.add_argument("--no-crossdirect", action="store_true", - help="Don't use the new, faster 'crossdirect' method," - " use the old 'distcc-sshd' method instead. Use" - " if crossdirect broke something. This option" - " and the legacy 'distcc-sshd' code will be" - " removed soon if no problems turn up.") parser.add_argument("--distcc-nofallback", action="store_false", help="when using the cross compiler via distcc fails," "do not fall back to compiling slowly with QEMU",