coreinfo: Fix libpayload to not install to libpayload/libpayload
Libpayload installs into the libpayload/ directory under the directory you point it to. Since we were pointing it to build/libpayload, it was installing to build/libpayload/libpayload. Change-Id: I11029fcfb232d9b66eb3f310fa9e663236d4b213 Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: https://review.coreboot.org/13966 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
parent
71d3101259
commit
00e49aed52
|
@ -48,12 +48,12 @@ HOSTCFLAGS := -I$(srck) -I$(objk)
|
|||
HOSTCXXFLAGS := -I$(srck) -I$(objk)
|
||||
|
||||
LIBCONFIG_PATH := ../libpayload
|
||||
LIBPAYLOAD_DIR := build/libpayload
|
||||
HAVE_LIBPAYLOAD := $(wildcard $(LIBPAYLOAD_DIR)/libpayload/lib/libpayload.a)
|
||||
LIBPAYLOAD_DIR := $(coreinfo_obj)/libpayload
|
||||
HAVE_LIBPAYLOAD := $(wildcard $(LIBPAYLOAD_DIR)/lib/libpayload.a)
|
||||
LIB_CONFIG ?= defconfig
|
||||
OBJCOPY ?= objcopy
|
||||
|
||||
INCLUDES = -I$(coreinfo_obj) -include $(LIBPAYLOAD_DIR)/libpayload/include/kconfig.h
|
||||
INCLUDES = -I$(coreinfo_obj) -include $(LIBPAYLOAD_DIR)/include/kconfig.h
|
||||
OBJECTS = cpuinfo_module.o cpuid.S.o pci_module.o coreboot_module.o \
|
||||
nvram_module.o bootlog_module.o ramdump_module.o lar_module.o \
|
||||
multiboot_module.o cbfs_module.o coreinfo.o
|
||||
|
@ -78,8 +78,8 @@ CC := $(CC_$(ARCH-y))
|
|||
AS := $(AS_$(ARCH-y))
|
||||
OBJCOPY := $(OBJCOPY_$(ARCH-y))
|
||||
|
||||
LPCC := CC="$(CC)" $(LIBPAYLOAD_DIR)/libpayload/bin/lpgcc
|
||||
LPAS := AS="$(AS)" $(LIBPAYLOAD_DIR)/libpayload/bin/lpas
|
||||
LPCC := CC="$(CC)" $(LIBPAYLOAD_DIR)/bin/lpgcc
|
||||
LPAS := AS="$(AS)" $(LIBPAYLOAD_DIR)/bin/lpas
|
||||
|
||||
CFLAGS += -Wall -Werror -Os -fno-builtin $(CFLAGS_$(ARCH-y)) $(INCLUDES)
|
||||
|
||||
|
@ -116,9 +116,9 @@ libpayload:
|
|||
else
|
||||
libpayload:
|
||||
printf "Building libpayload @ $(LIBCONFIG_PATH).\n"
|
||||
$(MAKE) -C $(LIBCONFIG_PATH) distclean
|
||||
$(MAKE) -C $(LIBCONFIG_PATH) distclean coreinfo_obj=$(coreinfo_obj)/libptmp
|
||||
$(MAKE) -C $(LIBCONFIG_PATH) $(LIB_CONFIG)
|
||||
$(MAKE) -C $(LIBCONFIG_PATH) DESTDIR=$(shell pwd)/$(LIBPAYLOAD_DIR) install
|
||||
$(MAKE) -C $(LIBCONFIG_PATH) install DESTDIR=$(coreinfo_obj)
|
||||
endif
|
||||
|
||||
$(coreinfo_obj)/config.h:
|
||||
|
|
Loading…
Reference in New Issue