mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 07:46:48 +00:00
Revert "build: add option to warn on recursive dependency"
This reverts commit3204430e38
. Reverting this commit in preparation for revertingdcf3e63a35
("build: scripts/config - update to kconfig-v5.6") which introduces various unaddressed build breakages. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
parent
fbc01f2a4c
commit
6c16d64b2a
@ -102,7 +102,7 @@ prepare-tmpinfo: FORCE
|
||||
ifneq ($(DISTRO_PKG_CONFIG),)
|
||||
scripts/config/%onf: export PATH:=$(dir $(DISTRO_PKG_CONFIG)):$(PATH)
|
||||
endif
|
||||
scripts/config/%onf: CFLAGS+= -O2 $(if $(WARN_RECURSIVE_DEP),-DWARN_RECURSIVE_DEP)
|
||||
scripts/config/%onf: CFLAGS+= -O2
|
||||
scripts/config/%onf:
|
||||
@$(_SINGLE)$(SUBMAKE) -s -C scripts/config $(notdir $@) CC="$(HOSTCC_WRAPPER)"
|
||||
|
||||
|
@ -16,10 +16,6 @@ OpenWrt Buildroot:
|
||||
- reverted an upstream change that avoids writing symbols that are not
|
||||
visible to .config, which breaks OpenWrt busybox's '.config' generation
|
||||
logic.
|
||||
- add a compilation option (-DWARN_RECURSIVE_DEP) to treat recursive deps
|
||||
as a warning, avoiding a complete build failure because of unrelated or
|
||||
minor recursive deps, or making a scrict check before commiting a change
|
||||
that may cause one.
|
||||
- use pre-built *.lex.c *.tab.[ch] files by default, to avoid depending on
|
||||
flex & bison. Rebuild/remove these files only if running make with
|
||||
BUILD_SHIPPED_FILES defined
|
||||
|
@ -1250,11 +1250,6 @@ struct symbol *sym_check_deps(struct symbol *sym)
|
||||
sym->flags &= ~SYMBOL_CHECK;
|
||||
}
|
||||
|
||||
#ifdef WARN_RECURSIVE_DEP
|
||||
if (sym2 && sym2 == sym)
|
||||
sym2 = NULL;
|
||||
#endif
|
||||
|
||||
return sym2;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user