diff options
| author | Werner Zeh <werner.zeh@siemens.com> | 2019-10-04 07:01:13 +0200 |
|---|---|---|
| committer | Werner Zeh <werner.zeh@siemens.com> | 2019-10-08 05:54:30 +0000 |
| commit | b7f1c2d2f1da42c6fbcdb9c5c394f5ca128296ab (patch) | |
| tree | a5701f48fed675a734077f81e094c9fba31069af | |
| parent | dafb66142e90b531209a59aa2484c92d2f33d0b0 (diff) | |
Revert "site-local: Allow to read Makefile.inc w/o .config"
This reverts commit 275f2e22a1a441d48a12bfe39ef3ce960efd7a04.
Since in this commit the inclusion of site-local/Makefile.inc was moved
outside of the guard 'ifeq ($(NOCOMPILE),1)', this Makefile.inc will be
included always here (what seems to be the intention of this commit).
As we have a second place where site-local/Makefile.inc is included
(top-level Makefile.inc via subdirs-y class) this unconditional include
leads to a double included site-local/Makefile.inc. Therefore one will
get errors if a separate rule is used in site-local/Makefile.inc.
Change-Id: I0a693c1d793b978c8023e4f107dce139d537d8db
Signed-off-by: Werner Zeh <werner.zeh@siemens.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35786
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
| -rw-r--r-- | Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -144,12 +144,11 @@ endif \mv -f $@.tmp $@ 2> /dev/null rm -f $@.tmp --include $(TOPLEVEL)/site-local/Makefile.inc - ifeq ($(NOCOMPILE),1) include $(TOPLEVEL)/Makefile.inc include $(TOPLEVEL)/payloads/Makefile.inc include $(TOPLEVEL)/util/testing/Makefile.inc +-include $(TOPLEVEL)/site-local/Makefile.inc real-all: @echo "Error: Expected config file ($(DOTCONFIG)) not present." >&2 @echo "Please specify a config file or run 'make menuconfig' to" >&2 |