mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-28 21:56:31 +00:00
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) <arnout@mind.be> Reviewed-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
5e3f89666b
commit
2048e22fa1
7
Makefile
7
Makefile
@ -34,13 +34,6 @@ SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
|
|||||||
# build by preventing it from being forwarded to sub-make calls.
|
# build by preventing it from being forwarded to sub-make calls.
|
||||||
ifneq ("$(origin O)", "command line")
|
ifneq ("$(origin O)", "command line")
|
||||||
O := $(CURDIR)/output
|
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
|
endif
|
||||||
|
|
||||||
# Check if the current Buildroot execution meets all the pre-requisites.
|
# Check if the current Buildroot execution meets all the pre-requisites.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user