aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorqthedev <qthedev@protonmail.com>2022-02-05 10:25:16 +0000
committerTom Rini <trini@konsulko.com>2022-02-11 11:28:47 -0500
commit42db3738065d5adb41f7481d21eb2823c929b8e6 (patch)
tree8ebb7c30592690fd601d7dd02a24dc8bf683b66c /Makefile
parent63de067a1bcf57d66d6f68e6524f3e7fa8e5ea3d (diff)
downloadu-boot-42db3738065d5adb41f7481d21eb2823c929b8e6.zip
u-boot-42db3738065d5adb41f7481d21eb2823c929b8e6.tar.gz
u-boot-42db3738065d5adb41f7481d21eb2823c929b8e6.tar.bz2
Replace echo -n's used in environment processing with touch
echo -n does not give the intended effect when invoked in macOS through /bin/sh, which is the shell make uses by default, see "https://stackoverflow.com/questions/11675070/makefile-echo-n-not-working" for a detailed explanation. In this case, it resulted in "-n" being written to env.txt and env.in even though they should be empty, which caused compilation to fail with "Your board uses a text-file environment, so must not define CONFIG_EXTRA_ENV_SETTINGS". This patch prevents the error by replacing echo -n's with touch, as they are used to create empty files in these cases.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 1ee7089..fa9bac4 100644
--- a/Makefile
+++ b/Makefile
@@ -1843,7 +1843,7 @@ quiet_cmd_gen_envp = ENVP $@
-I$(srctree)/arch/$(ARCH)/include \
$< -o $@; \
else \
- echo -n >$@ ; \
+ touch $@ ; \
fi
include/generated/env.in: include/generated/env.txt FORCE
$(call cmd,gen_envp)
@@ -1860,7 +1860,7 @@ quiet_cmd_envc = ENVC $@
elif [ -n "$(ENV_SOURCE_FILE)" ]; then \
echo "Missing file $(ENV_FILE_CFG)"; \
else \
- echo -n >$@ ; \
+ touch $@ ; \
fi
include/generated/env.txt: $(wildcard $(ENV_FILE)) FORCE