diff options
| author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2011-05-10 22:45:33 +0200 |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2011-05-10 22:45:33 +0200 |
| commit | bb27382f3b749bf01fcfcce77340c7cf705247ef (patch) | |
| tree | ef1870885e58eae53bc2dc145d13af25e68471c8 /kconfig | |
| parent | 3796ca588504d11e8d57a475065901e40f825054 (diff) | |
| download | crosstool-ng-bb27382f3b749bf01fcfcce77340c7cf705247ef.tar.gz crosstool-ng-bb27382f3b749bf01fcfcce77340c7cf705247ef.tar.bz2 crosstool-ng-bb27382f3b749bf01fcfcce77340c7cf705247ef.zip | |
kconfig: fix choice multi-display
In case a choices has different combinations, it can be displayed
more than once.
See the discussion thread on the linux-kbuild ML:
http://www.spinics.net/lists/linux-kbuild/msg04709.html
The fix applied here was proposed by Arnaud LACOMBE.
That fix, or a similar one, will probably be pushed upstream soon.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Diffstat (limited to 'kconfig')
| -rw-r--r-- | kconfig/menu.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kconfig/menu.c b/kconfig/menu.c index 7ec25223..8cb7a573 100644 --- a/kconfig/menu.c +++ b/kconfig/menu.c @@ -285,6 +285,11 @@ void menu_finalize(struct menu *parent) } } } + if (parent->prompt && + !expr_is_yes(parent->prompt->visible.expr)) { + parent->visibility = expr_alloc_and (parent->visibility, + parent->prompt->visible.expr); + } /* set the type of the remaining choice values */ for (menu = parent->list; menu; menu = menu->next) { current_entry = menu; |