From: Arnout Vandecappelle Date: Thu, 3 Nov 2016 01:55:17 +0000 (+0100) Subject: core: remove redundant "override O := $(O)" X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2048e22fa1fe2d5ff654e0fb6a17042254efc2a3;p=buildroot.git core: remove redundant "override O := $(O)" The top-level Makefile contains an "override O := $(O)" statement that is purportedly required to make sure the O flag doesn't leak into the environment of sub-makes. However, since commit 173135d, there is already an "override O := ..." a few lines down. Therefore, the first override is redundant. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Samuel Martin Signed-off-by: Thomas Petazzoni --- diff --git a/Makefile b/Makefile index 4b494a3307..cb030d46cf 100644 --- a/Makefile +++ b/Makefile @@ -34,13 +34,6 @@ SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ # build by preventing it from being forwarded to sub-make calls. ifneq ("$(origin O)", "command line") O := $(CURDIR)/output -else -# Strangely enough O is still passed to submakes with MAKEOVERRIDES -# (with make 3.81 atleast), the only thing that changes is the output -# of the origin function (command line -> environment). -# Unfortunately some packages don't look at origin (E.G. uClibc 0.9.31+) -# To really make O go away, we have to override it. -override O := $(O) endif # Check if the current Buildroot execution meets all the pre-requisites.