summaryrefslogtreecommitdiff
path: root/kconfig
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2011-05-22 15:44:34 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2011-05-22 15:44:34 (GMT)
commitd85527556282c902b65eaef62d620a909112757d (patch)
treedf780cfbc999fc1109b58b773317d323263ad0b8 /kconfig
parent93b6fd50326780170f7f0992f993250d9f91792d (diff)
kconfig: fix forward dependencies
In case a set of options are conditional to two different paths, the forward dependencies in these options is wrong, but in the first path. Fix by Arnaud Lacombe on linux-kbuild ML: http://www.spinics.net/lists/linux-kbuild/msg04832.html Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Diffstat (limited to 'kconfig')
-rw-r--r--kconfig/menu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kconfig/menu.c b/kconfig/menu.c
index 8cb7a57..791f688 100644
--- a/kconfig/menu.c
+++ b/kconfig/menu.c
@@ -361,7 +361,7 @@ void menu_finalize(struct menu *parent)
last_menu->next = NULL;
}
- sym->dir_dep.expr = parent->dep;
+ sym->dir_dep.expr = expr_alloc_or(sym->dir_dep.expr, parent->dep);
}
for (menu = parent->list; menu; menu = menu->next) {
if (sym && sym_is_choice(sym) &&