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 <luca@z3ntu.xyz>
Reviewed-by: Clayton Craft <clayton@craftyguy.net>
Link: https://lists.sr.ht/~postmarketos/pmbootstrap-devel/%3C20230613161437.570196-3-ollieparanoid@postmarketos.org%3E
This commit is contained in:
Oliver Smith 2023-06-13 18:14:36 +02:00
parent 7f5c87e5dd
commit 25b3530c4e
No known key found for this signature in database
GPG Key ID: 5AE7F5513E0885CB
2 changed files with 1 additions and 7 deletions

View File

@ -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"

View File

@ -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",