lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-linus:
  kbuild: fix vmlinux.o link
  kconfig: made check-lxdialog more portable
This commit is contained in:
Linus Torvalds
2008-05-01 11:31:24 -07:00
parent 2c4aabcca8 90ebd878a5
commit 6ed7b6a05d
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -794,7 +794,7 @@ endif # ifdef CONFIG_KALLSYMS
quiet_cmd_vmlinux-modpost = LD $@ quiet_cmd_vmlinux-modpost = LD $@
cmd_vmlinux-modpost = $(LD) $(LDFLAGS) -r -o $@ \ cmd_vmlinux-modpost = $(LD) $(LDFLAGS) -r -o $@ \
$(vmlinux-init) --start-group $(vmlinux-main) --end-group \ $(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 define rule_vmlinux-modpost
: :
+$(call cmd,vmlinux-modpost) +$(call cmd,vmlinux-modpost)
@@ -818,7 +818,9 @@ endif
ifdef CONFIG_KALLSYMS ifdef CONFIG_KALLSYMS
.tmp_vmlinux1: vmlinux.o .tmp_vmlinux1: vmlinux.o
endif 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) $(call if_changed_rule,vmlinux-modpost)
# The actual objects are generated when descending, # The actual objects are generated when descending,

6
scripts/kconfig/lxdialog/check-lxdialog.sh
View File

@@ -36,8 +36,10 @@ 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 -e " #include CURSES_LOC \n main() {}" | $cc -xc - -o $tmp 2>/dev/null <<'EOF'
$cc -xc - -o $tmp 2> /dev/null #include CURSES_LOC
main() {}
EOF
if [ $? != 0 ]; then if [ $? != 0 ]; then
echo " *** Unable to find the ncurses libraries or the" 1>&2 echo " *** Unable to find the ncurses libraries or the" 1>&2
echo " *** required header files." 1>&2 echo " *** required header files." 1>&2