From dbd302497db5bc6339ea24a27b91a6544abf36eb Mon Sep 17 00:00:00 2001 From: Rocky Breslow <1774125+rbreslow@users.noreply.github.com> Date: Tue, 10 Jan 2023 21:36:11 -0500 Subject: [PATCH] modules/musl-cross: use echo from the PATH to support NixOS NixOS doesn't have a traditional FHS where echo is available at `/bin/echo`. Instead, we must rely on the PATH for any distribution-managed utilities. Reverses https://github.com/osresearch/heads/issues/106. --- modules/musl-cross | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/musl-cross b/modules/musl-cross index b17f675f..9c601cc4 100644 --- a/modules/musl-cross +++ b/modules/musl-cross @@ -34,8 +34,8 @@ else # Force a full build of the cross compiler for target platform # No need to build i386 for x86 since coreboot uses its own compiler musl-cross_configure := \ - /bin/echo -e >> Makefile 'musl-target:' ; \ - /bin/echo -e >> Makefile '\t$$$$(MAKE) TARGET="$(MUSL_ARCH)-linux-musl" install' ; + echo -e >> Makefile 'musl-target:' ; \ + echo -e >> Makefile '\t$$$$(MAKE) TARGET="$(MUSL_ARCH)-linux-musl" install' ; CROSS_PATH ?= $(pwd)/crossgcc/$(CONFIG_TARGET_ARCH)