Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ed7b6a0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-linus 

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-linus:
  kbuild: fix vmlinux.o link
  kconfig: made check-lxdialog more portable
parents 2c4aabcc 90ebd878

Makefile

+4 −2
Original line number Diff line number Diff line
@@ -794,7 +794,7 @@ endif # ifdef CONFIG_KALLSYMS 
quiet_cmd_vmlinux-modpost = LD      $@

      cmd_vmlinux-modpost = $(LD) $(LDFLAGS) -r -o $@                          \

	 $(vmlinux-init) --start-group $(vmlinux-main) --end-group             \

	 $(filter-out $(vmlinux-init) $(vmlinux-main) $(vmlinux-lds) FORCE ,$^)

	 $(filter-out $(vmlinux-init) $(vmlinux-main) FORCE ,$^)

define rule_vmlinux-modpost

	:

	+$(call cmd,vmlinux-modpost)
@@ -818,7 +818,9 @@ endif 
ifdef CONFIG_KALLSYMS

.tmp_vmlinux1: vmlinux.o

endif

vmlinux.o: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) FORCE



modpost-init := $(filter-out init/built-in.o, $(vmlinux-init))

vmlinux.o: $(modpost-init) $(vmlinux-main) FORCE

	$(call if_changed_rule,vmlinux-modpost)



# The actual objects are generated when descending,

scripts/kconfig/lxdialog/check-lxdialog.sh

+4 −2
Original line number Diff line number Diff line
@@ -36,8 +36,10 @@ trap "rm -f $tmp" 0 1 2 3 15 


# Check if we can link to ncurses

check() {

	echo -e " #include CURSES_LOC \n main() {}" |

	    $cc -xc - -o $tmp 2> /dev/null

        $cc -xc - -o $tmp 2>/dev/null <<'EOF'

#include CURSES_LOC

main() {}

EOF

	if [ $? != 0 ]; then

	    echo " *** Unable to find the ncurses libraries or the"       1>&2

	    echo " *** required header files."                            1>&2