diff options
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -952,19 +952,19 @@ core-y := $(patsubst %/, %/built-in.o, $(core-y)) | |||
952 | drivers-y := $(patsubst %/, %/built-in.o, $(drivers-y)) | 952 | drivers-y := $(patsubst %/, %/built-in.o, $(drivers-y)) |
953 | net-y := $(patsubst %/, %/built-in.o, $(net-y)) | 953 | net-y := $(patsubst %/, %/built-in.o, $(net-y)) |
954 | libs-y1 := $(patsubst %/, %/lib.a, $(libs-y)) | 954 | libs-y1 := $(patsubst %/, %/lib.a, $(libs-y)) |
955 | libs-y2 := $(patsubst %/, %/built-in.o, $(libs-y)) | 955 | libs-y2 := $(filter-out %.a, $(patsubst %/, %/built-in.o, $(libs-y))) |
956 | libs-y := $(libs-y1) $(libs-y2) | ||
957 | virt-y := $(patsubst %/, %/built-in.o, $(virt-y)) | 956 | virt-y := $(patsubst %/, %/built-in.o, $(virt-y)) |
958 | 957 | ||
959 | # Externally visible symbols (used by link-vmlinux.sh) | 958 | # Externally visible symbols (used by link-vmlinux.sh) |
960 | export KBUILD_VMLINUX_INIT := $(head-y) $(init-y) | 959 | export KBUILD_VMLINUX_INIT := $(head-y) $(init-y) |
961 | export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y) $(drivers-y) $(net-y) $(virt-y) | 960 | export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y2) $(drivers-y) $(net-y) $(virt-y) |
961 | export KBUILD_VMLINUX_LIBS := $(libs-y1) | ||
962 | export KBUILD_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds | 962 | export KBUILD_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds |
963 | export LDFLAGS_vmlinux | 963 | export LDFLAGS_vmlinux |
964 | # used by scripts/pacmage/Makefile | 964 | # used by scripts/pacmage/Makefile |
965 | export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) arch Documentation include samples scripts tools) | 965 | export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) arch Documentation include samples scripts tools) |
966 | 966 | ||
967 | vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_INIT) $(KBUILD_VMLINUX_MAIN) | 967 | vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_INIT) $(KBUILD_VMLINUX_MAIN) $(KBUILD_VMLINUX_LIBS) |
968 | 968 | ||
969 | # Include targets which we want to execute sequentially if the rest of the | 969 | # Include targets which we want to execute sequentially if the rest of the |
970 | # kernel build went well. If CONFIG_TRIM_UNUSED_KSYMS is set, this might be | 970 | # kernel build went well. If CONFIG_TRIM_UNUSED_KSYMS is set, this might be |