d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools/build/make.py: Fix macOS build after a920b9817

Browse Source 
If we set STRIPBIN, we also have to set XSTRIPBIN since we otherwise
use the host /usr/bin/strip during buildworld. However, this does not
work on macOS since /usr/bin/strip doesn't handle ELF binaries.
This commit is contained in:
Alex Richardson 2020-12-22 17:14:32 +01:00 committed by Alex Richardson
parent 7fa2f2a62f
commit d037edf820
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tools/build/make.py
View File

@ -207,8 +207,8 @@ def default_cross_toolchain():
parsed_args.host_bindir)
# Using the default value for LD is fine (but not for XLD!)
use_cross_gcc = parsed_args.cross_compiler_type == "gcc"
# On non-FreeBSD we need to explicitly pass XCC/XLD/X_COMPILER_TYPE
use_cross_gcc = parsed_args.cross_compiler_type == "gcc"
check_required_make_env_var("XCC", "gcc" if use_cross_gcc else "clang",
parsed_args.cross_bindir)
check_required_make_env_var("XCXX",
@ -219,9 +219,26 @@ def default_cross_toolchain():
parsed_args.cross_bindir)
check_required_make_env_var("XLD", "ld" if use_cross_gcc else "ld.lld",
parsed_args.cross_bindir)
check_required_make_env_var("STRIPBIN",
"strip" if use_cross_gcc else "llvm-strip",
parsed_args.cross_bindir)
# We also need to set STRIPBIN if there is no working strip binary
# in $PATH.
if not shutil.which("strip"):
if sys.platform.startswith("darwin"):
# On macOS systems we have to use /usr/bin/strip.
sys.exit("Cannot find required tool 'strip'. Please install the"
" host compiler and command line tools.")
if parsed_args.host_compiler_type == "clang":
strip_binary = "llvm-strip"
else:
strip_binary = "strip"
check_required_make_env_var("STRIPBIN", strip_binary,
parsed_args.cross_bindir)
if os.getenv("STRIPBIN") or "STRIPBIN" in new_env_vars:
# If we are setting STRIPBIN, we have to set XSTRIPBIN to the
# default if it is not set otherwise already.
if not os.getenv("XSTRIPBIN") and not is_make_var_set("XSTRIPBIN"):
# Use the bootstrapped elftoolchain strip:
new_env_vars["XSTRIPBIN"] = "strip"
bmake_binary = bootstrap_bmake(source_root, objdir_prefix)
# at -j1 cleandir+obj is unbearably slow. AUTO_OBJ helps a lot