diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-03-26 18:58:13 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-03-26 18:58:13 (GMT) |
| commit | 6501c29fd1fa259fd836a94c363a6593d8db5a6a (patch) | |
| tree | 847696f6579e7eef12731afbe41fa33410b7b2d3 /config/config.mk | |
| parent | 355586027b3fb898d4272ddd4f788b772085e7de (diff) | |
Merge r1432:1437 from /branches/newlib into /trunk :
- under bare-metal, the user is responsible for providing a gdbserver stub (r1433)
- install a CT_TARGET-cc -> CT_TARGET-gcc symlink for the core gcc (r1434)
- allow broader dependency in generated config files (r1435, r1436)
- prepare C library menuconfig for using a C library under bare-metal (r1437)
/trunk/scripts/build/cc/gcc.sh | 4 4 0 0 ++++
/trunk/config/debug/gdb.in | 5 5 0 0 +++++
/trunk/config/libc/glibc.in | 1 1 0 0 +
/trunk/config/libc/uClibc.in | 1 1 0 0 +
/trunk/config/libc/eglibc.in | 2 1 1 0 +-
/trunk/config/config.mk | 20 8 12 0 ++++++++------------
/trunk/config/arch/sh.in | 2 1 1 0 +-
/trunk/config/arch/ia64.in | 2 1 1 0 +-
/trunk/config/arch/powerpc64.in | 2 1 1 0 +-
/trunk/config/libc.in | 4 0 4 0 ----
10 files changed, 23 insertions(+), 20 deletions(-)
Diffstat (limited to 'config/config.mk')
| -rw-r--r-- | config/config.mk | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/config/config.mk b/config/config.mk index 5943d10..6945d09 100644 --- a/config/config.mk +++ b/config/config.mk @@ -87,12 +87,10 @@ define build_gen_choice_in _entry=$$(echo "$${entry}" |$(sed) -r -s -e 's/[-.+]/_/g;'); \ echo "config $(3)_$${_entry}"; \ echo " bool"; \ - printf " prompt \"$${entry}"; \ - if $(grep) -E '^# +EXPERIMENTAL$$' $${file} >/dev/null 2>&1; then \ - echo " (EXPERIMENTAL)\""; \ - echo " depends on EXPERIMENTAL"; \ - else \ - echo "\""; \ + echo " prompt \"$${entry}\""; \ + dep_val=$$($(grep) -E '^# depends on ' $${file} 2>/dev/null); \ + if [ -n "$${dep_val}" ]; then \ + echo " $${dep_val#\# }"; \ fi; \ echo ""; \ done; \ @@ -134,12 +132,10 @@ define build_gen_menu_in _entry=$$(echo "$${entry}" |$(sed) -r -s -e 's/[-.+]/_/g;'); \ echo "menuconfig $(3)_$${_entry}"; \ echo " bool"; \ - printf " prompt \"$${entry}"; \ - if $(grep) -E '^# +EXPERIMENTAL$$' $${file} >/dev/null 2>&1; then \ - echo " (EXPERIMENTAL)\""; \ - echo " depends on EXPERIMENTAL"; \ - else \ - echo "\""; \ + echo " prompt \"$${entry}\""; \ + dep_val=$$($(grep) -E '^# depends on ' $${file} 2>/dev/null); \ + if [ -n "$${dep_val}" ]; then \ + echo " $${dep_val#\# }"; \ fi; \ echo "if $(3)_$${_entry}"; \ echo "source $${file}"; \ |