Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-bugfix
This commit is contained in:
commit
eeb059e0a6
2
Makefile
2
Makefile
|
@ -442,7 +442,7 @@ export KBUILD_DEFCONFIG
|
||||||
config %config: scripts_basic outputmakefile FORCE
|
config %config: scripts_basic outputmakefile FORCE
|
||||||
$(Q)mkdir -p include/linux
|
$(Q)mkdir -p include/linux
|
||||||
$(Q)$(MAKE) $(build)=scripts/kconfig $@
|
$(Q)$(MAKE) $(build)=scripts/kconfig $@
|
||||||
$(Q)$(MAKE) .kernelrelease
|
$(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
|
||||||
|
|
||||||
else
|
else
|
||||||
# ===========================================================================
|
# ===========================================================================
|
||||||
|
|
|
@ -119,7 +119,7 @@ $(SRC_ARCH)/.links:
|
||||||
@ln -sfn $(SRC_ARCH)/$(SARCH)/lib $(SRC_ARCH)/lib
|
@ln -sfn $(SRC_ARCH)/$(SARCH)/lib $(SRC_ARCH)/lib
|
||||||
@ln -sfn $(SRC_ARCH)/$(SARCH) $(SRC_ARCH)/arch
|
@ln -sfn $(SRC_ARCH)/$(SARCH) $(SRC_ARCH)/arch
|
||||||
@ln -sfn $(SRC_ARCH)/$(SARCH)/vmlinux.lds.S $(SRC_ARCH)/kernel/vmlinux.lds.S
|
@ln -sfn $(SRC_ARCH)/$(SARCH)/vmlinux.lds.S $(SRC_ARCH)/kernel/vmlinux.lds.S
|
||||||
@ln -sfn $(SRC_ARCH)/$(SARCH)/asm-offsets.c $(SRC_ARCH)/kernel/asm-offsets.c
|
@ln -sfn $(SRC_ARCH)/$(SARCH)/kernel/asm-offsets.c $(SRC_ARCH)/kernel/asm-offsets.c
|
||||||
@touch $@
|
@touch $@
|
||||||
|
|
||||||
# Create link to sub arch includes
|
# Create link to sub arch includes
|
||||||
|
|
|
@ -2,8 +2,11 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
check-lxdialog := $(srctree)/$(src)/check-lxdialog.sh
|
check-lxdialog := $(srctree)/$(src)/check-lxdialog.sh
|
||||||
HOST_EXTRACFLAGS:= $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
|
|
||||||
HOST_LOADLIBES := $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
|
# Use reursively expanded variables so we do not call gcc unless
|
||||||
|
# we really need to do so. (Do not call gcc as part of make mrproper)
|
||||||
|
HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
|
||||||
|
HOST_LOADLIBES = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
|
||||||
|
|
||||||
HOST_EXTRACFLAGS += -DLOCALE
|
HOST_EXTRACFLAGS += -DLOCALE
|
||||||
|
|
||||||
|
|
|
@ -4,17 +4,17 @@
|
||||||
# What library to link
|
# What library to link
|
||||||
ldflags()
|
ldflags()
|
||||||
{
|
{
|
||||||
echo "main() {}" | $cc -lncursesw -xc - -o /dev/null 2> /dev/null
|
$cc -print-file-name=libncursesw.so | grep -q /
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
echo '-lncursesw'
|
echo '-lncursesw'
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
echo "main() {}" | $cc -lncurses -xc - -o /dev/null 2> /dev/null
|
$cc -print-file-name=libncurses.so | grep -q /
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
echo '-lncurses'
|
echo '-lncurses'
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
echo "main() {}" | $cc -lcurses -xc - -o /dev/null 2> /dev/null
|
$cc -print-file-name=libcurses.so | grep -q /
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
echo '-lcurses'
|
echo '-lcurses'
|
||||||
exit
|
exit
|
||||||
|
@ -36,10 +36,13 @@ ccflags()
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
compiler=""
|
# Temp file, try to clean up after us
|
||||||
|
tmp=.lxdialog.tmp
|
||||||
|
trap "rm -f $tmp" 0 1 2 3 15
|
||||||
|
|
||||||
# Check if we can link to ncurses
|
# Check if we can link to ncurses
|
||||||
check() {
|
check() {
|
||||||
echo "main() {}" | $cc -xc - -o /dev/null 2> /dev/null
|
echo "main() {}" | $cc -xc - -o $tmp 2> /dev/null
|
||||||
if [ $? != 0 ]; then
|
if [ $? != 0 ]; then
|
||||||
echo " *** Unable to find the ncurses libraries." 1>&2
|
echo " *** Unable to find the ncurses libraries." 1>&2
|
||||||
echo " *** make menuconfig require the ncurses libraries" 1>&2
|
echo " *** make menuconfig require the ncurses libraries" 1>&2
|
||||||
|
@ -59,6 +62,7 @@ if [ $# == 0 ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
cc=""
|
||||||
case "$1" in
|
case "$1" in
|
||||||
"-check")
|
"-check")
|
||||||
shift
|
shift
|
||||||
|
|
Loading…
Reference in New Issue