From 3d5d1361ee9dcc4edc15c633d0ecbb630a9a11fc Mon Sep 17 00:00:00 2001 From: Jessica Clarke Date: Sat, 7 Sep 2024 02:19:09 +0100 Subject: [PATCH] cheribsd: Use in-tree strip for bootstrap toolchain over host one If the host one is llvm-strip this is less of an issue, but when binutils is used we end up trying to use /usr/bin/strip for target binaries. --- pycheribuild/projects/cross/cheribsd.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pycheribuild/projects/cross/cheribsd.py b/pycheribuild/projects/cross/cheribsd.py index 0b2e4bec0..9e05d2bae 100644 --- a/pycheribuild/projects/cross/cheribsd.py +++ b/pycheribuild/projects/cross/cheribsd.py @@ -1527,8 +1527,8 @@ def add_cross_build_options(self) -> None: if self.use_bootstrapped_toolchain: assert "XCC" not in self.make_args.env_vars # We have to provide the default X* values so that Makefile.inc1 does not disable MK_CLANG_BOOTSTRAP and - # doesn't try to cross-compile using the host compilers - self.make_args.set_env(XCC="cc", XCXX="c++", XCPP="cpp") + # doesn't try to use the host toolchain for cross-building + self.make_args.set_env(XCC="cc", XCXX="c++", XCPP="cpp", XSTRIPBIN="strip") # won't work on a case-insensitive file system and is also really slow (and missing tools on linux) self.make_args.set_with_options(MAN=False) # links from /usr/bin/mail to /usr/bin/Mail won't work on case-insensitve fs