summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2017-09-05 01:53:58 -0600
committerTom Rini <trini@konsulko.com>2017-09-05 20:34:08 -0400
commit573329571435eae967182baf94b2146188fb1ee5 (patch)
treed583578af128ea522ede72baa84817bcacd2f7e5 /Makefile
parentde4e4edaffeeb56aeb9354662872cbbcaf46d4cd (diff)
env: Fix operation of 'make environ'
This was broken by the recent environment refactoring. Specifically: $ make environ scripts/Makefile.build:59: tools/environ/Makefile: No such file or directory make[1]: *** No rule to make target 'tools/environ/Makefile'. Stop. make: *** [Makefile:1469: environ] Error 2 Fix this by updating the Makefile and adjusting the #include filesnames in two C files. Fixes: ec74f5f (Makefile: Rename 'env' target to 'environ') Reported-by: Måns Rullgård <mans@mansr.com> Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 020ebd50ad..70971b1101 100644
--- a/Makefile
+++ b/Makefile
@@ -1465,14 +1465,14 @@ checkarmreloc: u-boot
false; \
fi
-environ: scripts_basic
+envtools: scripts_basic
$(Q)$(MAKE) $(build)=tools/env
tools-only: scripts_basic $(version_h) $(timestamp_h)
$(Q)$(MAKE) $(build)=tools
tools-all: export HOST_TOOLS_ALL=y
-tools-all: environ tools ;
+tools-all: envtools tools ;
cross_tools: export CROSS_BUILD_TOOLS=y
cross_tools: tools ;