From bb701610aaa645644bfa046b30711fc5acb7c6c2 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 26 Jan 2013 13:44:47 -0500 Subject: buildsys: allow the toolchain to search its dirs for kernel headers Setting KERNEL_HEADERS up to the exact path all the time is a pita, especially when the toolchain is often times already configured to do the right thing. So if the user has set that to "", don't force any specific paths. Signed-off-by: Mike Frysinger --- extra/Configs/Config.in.arch | 4 +++- extra/scripts/gen_bits_syscall_h.sh | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'extra') diff --git a/extra/Configs/Config.in.arch b/extra/Configs/Config.in.arch index e97786b81..6d93433dc 100644 --- a/extra/Configs/Config.in.arch +++ b/extra/Configs/Config.in.arch @@ -192,7 +192,7 @@ config UCLIBC_HAS_LONG_DOUBLE_MATH config KERNEL_HEADERS string "Linux kernel header location" - default "/usr/include" + default "" help The kernel source you use to compile with should be the same as the Linux kernel you run your apps on. uClibc doesn't even @@ -203,6 +203,8 @@ config KERNEL_HEADERS but then run on Linux 2.0.x, lchown will be compiled into uClibc, but won't work at all. You have been warned. + If you don't set this, we'll assume the toolchain can find them. + config UCLIBC_UCLINUX_BROKEN_MUNMAP bool depends on !ARCH_USE_MMU diff --git a/extra/scripts/gen_bits_syscall_h.sh b/extra/scripts/gen_bits_syscall_h.sh index f6353baa2..4d42f6949 100755 --- a/extra/scripts/gen_bits_syscall_h.sh +++ b/extra/scripts/gen_bits_syscall_h.sh @@ -15,7 +15,12 @@ # # Warning!!! This does _no_ error checking!!! -INCLUDE_OPTS="-nostdinc -I${KERNEL_HEADERS}" +if [ "${KERNEL_HEADERS:-/}" != "/" ] ; then + INCLUDE_OPTS="-nostdinc -I${KERNEL_HEADERS}" +else + # Let the toolchain use its configure paths. + INCLUDE_OPTS= +fi case $CC in *icc*) CC_SYSNUM_ARGS="-dM" ;; -- cgit v1.2.3