diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-10 13:24:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-10 13:24:55 -0800 |
| commit | 20210a98463e2abac31676ee141459fc23252927 (patch) | |
| tree | 100e6650fc3f7bdac83ec676bdad09778d87064f /scripts/kconfig/mconf-cfg.sh | |
| parent | 688daed2e5daf0a1513effdc05ce3c56ade836f9 (diff) | |
| parent | 5625dcfbbcf892e40e8d60abbb5f56701a1d031c (diff) | |
| download | linux-20210a98463e2abac31676ee141459fc23252927.tar.bz2 | |
Merge tag 'kbuild-fixes-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild fixes from Masahiro Yamada:
- Search for <ncurses.h> in the default header path of HOSTCC
- Tweak the option order to be kind to old BSD awk
- Remove 'kvmconfig' and 'xenconfig' shorthands
- Fix documentation
* tag 'kbuild-fixes-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
Documentation: kbuild: Fix section reference
kconfig: remove 'kvmconfig' and 'xenconfig' shorthands
lib/raid6: Let $(UNROLL) rules work with macOS userland
kconfig: Support building mconf with vendor sysroot ncurses
kconfig: config script: add a little user help
MAINTAINERS: adjust GCC PLUGINS after gcc-plugin.sh removal
Diffstat (limited to 'scripts/kconfig/mconf-cfg.sh')
| -rwxr-xr-x | scripts/kconfig/mconf-cfg.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh index aa68ec95620d..fcd4acd4e9cb 100755 --- a/scripts/kconfig/mconf-cfg.sh +++ b/scripts/kconfig/mconf-cfg.sh @@ -33,7 +33,9 @@ if [ -f /usr/include/ncurses/ncurses.h ]; then exit 0 fi -if [ -f /usr/include/ncurses.h ]; then +# As a final fallback before giving up, check if $HOSTCC knows of a default +# ncurses installation (e.g. from a vendor-specific sysroot). +if echo '#include <ncurses.h>' | "${HOSTCC}" -E - >/dev/null 2>&1; then echo cflags=\"-D_GNU_SOURCE\" echo libs=\"-lncurses\" exit 0 |