[coreboot-gerrit] Patch set updated for coreboot: libpayload/Makefile: include .xcompile before vars using it

[Martin Roth (martinroth@google.com)]

Martin Roth (martinroth at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18230

-gerrit

commit 22646d8c547d3b01a4214c0856dad6cf243113e7
Author: Martin Roth <martinroth at google.com>
Date:   Wed Jan 25 09:09:23 2017 -0700

    libpayload/Makefile: include .xcompile before vars using it
    
    coreinfo was broken because libpayload wasn't building correctly.  The
    change to skip running xcompile on non-compile targets moved the include
    of .xcompile to below where the variables were getting set.
    
    commit 0ffef882: (build system: don't run xcompile or git for %clean/
    %config targets")
    
    This patch corrects the order of those two pieces.
    
    Change-Id: I1550fd24ac7d50356a29847d232855d653093720
    Signed-off-by: Martin Roth <martinroth at google.com>
---
 payloads/libpayload/Makefile | 52 ++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile
index 34df485..41df1cc 100644
--- a/payloads/libpayload/Makefile
+++ b/payloads/libpayload/Makefile
@@ -93,32 +93,6 @@ include $(srck)/Makefile
 
 include $(HAVE_DOTCONFIG)
 
-ARCHDIR-$(CONFIG_LP_ARCH_ARM)     := arm
-ARCHDIR-$(CONFIG_LP_ARCH_ARM64)   := arm64
-ARCHDIR-$(CONFIG_LP_ARCH_MIPS)    := mips
-ARCHDIR-$(CONFIG_LP_ARCH_X86)     := x86
-
-ARCH-y := $(ARCHDIR-y)
-
-# If architecture folder name is different from xcompile architecture name,
-# override here.
-ARCH-$(CONFIG_LP_ARCH_ARM)     := arm
-ARCH-$(CONFIG_LP_ARCH_ARM64)   := arm64
-ARCH-$(CONFIG_LP_ARCH_X86)     := x86_32
-ARCH-$(CONFIG_LP_ARCH_MIPS)    := mips
-
-CC := $(CC_$(ARCH-y))
-AS := $(AS_$(ARCH-y))
-LD := $(LD_$(ARCH-y))
-NM := $(NM_$(ARCH-y))
-OBJCOPY := $(OBJCOPY_$(ARCH-y))
-OBJDUMP := $(OBJDUMP_$(ARCH-y))
-READELF := $(READELF_$(ARCH-y))
-STRIP := $(STRIP_$(ARCH-y))
-AR := $(AR_$(ARCH-y))
-
-CFLAGS += $(CFLAGS_$(ARCH-y))
-
 # Three cases where we don't need fully populated $(obj) lists:
 # 1. when no .config exists
 # 2. when make config (in any flavour) is run
@@ -156,6 +130,32 @@ HOSTCC:=clang
 endif
 endif
 
+ARCHDIR-$(CONFIG_LP_ARCH_ARM)     := arm
+ARCHDIR-$(CONFIG_LP_ARCH_ARM64)   := arm64
+ARCHDIR-$(CONFIG_LP_ARCH_MIPS)    := mips
+ARCHDIR-$(CONFIG_LP_ARCH_X86)     := x86
+
+ARCH-y := $(ARCHDIR-y)
+
+# If architecture folder name is different from xcompile architecture name,
+# override here.
+ARCH-$(CONFIG_LP_ARCH_ARM)     := arm
+ARCH-$(CONFIG_LP_ARCH_ARM64)   := arm64
+ARCH-$(CONFIG_LP_ARCH_X86)     := x86_32
+ARCH-$(CONFIG_LP_ARCH_MIPS)    := mips
+
+CC := $(CC_$(ARCH-y))
+AS := $(AS_$(ARCH-y))
+LD := $(LD_$(ARCH-y))
+NM := $(NM_$(ARCH-y))
+OBJCOPY := $(OBJCOPY_$(ARCH-y))
+OBJDUMP := $(OBJDUMP_$(ARCH-y))
+READELF := $(READELF_$(ARCH-y))
+STRIP := $(STRIP_$(ARCH-y))
+AR := $(AR_$(ARCH-y))
+
+CFLAGS += $(CFLAGS_$(ARCH-y))
+
 ifeq ($(CONFIG_LP_CCACHE),y)
 CCACHE:=$(word 1,$(wildcard $(addsuffix /ccache,$(subst :, ,$(PATH)))))
 ifeq ($(CCACHE),)