Nico Huber has uploaded this change for review.

View Change

libpayload: Move .xcompile into $(obj)

And drop the `.`.

Having `.xcompile` in a central place led to race conditions when
multiple payloads try to build their own libpayloads in parallel.

Change-Id: I504e1862db79b368289867f7568c9169f27a1549
Signed-off-by: Nico Huber <nico.h@gmx.de>
---
M payloads/libpayload/Makefile
M payloads/libpayload/Makefile.inc
M payloads/libpayload/sample/Makefile
3 files changed, 7 insertions(+), 7 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/47651/1

diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile
index b5687c3..d2614fa 100644
--- a/payloads/libpayload/Makefile
+++ b/payloads/libpayload/Makefile
@@ -126,13 +126,13 @@
 
 # in addition to the dependency below, create the file if it doesn't exist
 # to silence stupid warnings about a file that would be generated anyway.
-$(if $(wildcard .xcompile)$(NOCOMPILE),,$(eval $(shell $(top)/../../util/xcompile/xcompile $(XGCCPATH) > .xcompile)))
+$(if $(wildcard $(obj)/xcompile)$(NOCOMPILE),,$(eval $(shell mkdir -p $(obj) && $(top)/../../util/xcompile/xcompile $(XGCCPATH) > $(obj)/xcompile)))
 
-.xcompile: $(top)/../../util/xcompile/xcompile
+$(obj)/xcompile: $(top)/../../util/xcompile/xcompile
 	$< $(XGCCPATH) > $@.tmp
 	\mv -f $@.tmp $@ 2> /dev/null
 
--include .xcompile
+-include $(obj)/xcompile
 
 CC := $(CC_$(ARCH-y))
 AS := $(AS_$(ARCH-y))
@@ -294,7 +294,7 @@
 	rm -rf $(DOXYGEN_OUTPUT_DIR)
 
 clean-for-update: doxygen-clean clean-for-update-target
-	rm -f $(allobjs) .xcompile
+	rm -f $(allobjs) $(obj)/xcompile
 	rm -f $(DEPENDENCIES)
 	rmdir -p $(alldirs) 2>/dev/null >/dev/null || true
 
@@ -306,6 +306,6 @@
 	rm -f cscope.out
 
 distclean: clean-cscope clean
-	rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig* .ccwrap .xcompile junit.xml
+	rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig* .ccwrap junit.xml
 
 .PHONY: $(PHONY) clean clean-cscope cscope distclean doxygen doxy
diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc
index 6188dde..a954d74 100644
--- a/payloads/libpayload/Makefile.inc
+++ b/payloads/libpayload/Makefile.inc
@@ -121,7 +121,7 @@
 	install -m 755 bin/lpas $(DESTDIR)/libpayload/bin
 	install -m 644 bin/lp.functions $(DESTDIR)/libpayload/bin
 	install -m 644 $(DOTCONFIG) $(DESTDIR)/libpayload/libpayload.config
-	install -m 755 .xcompile $(DESTDIR)/libpayload/libpayload.xcompile
+	install -m 755 $(obj)/xcompile $(DESTDIR)/libpayload/libpayload.xcompile
 
 clean-for-update-target:
 	rm -f $(addsuffix .a,$(addprefix $(obj)/,$(libraries))) $(obj)/libpayload.a
diff --git a/payloads/libpayload/sample/Makefile b/payloads/libpayload/sample/Makefile
index eb70af9..637e45d 100644
--- a/payloads/libpayload/sample/Makefile
+++ b/payloads/libpayload/sample/Makefile
@@ -28,7 +28,7 @@
 
 # Sample libpayload Makefile.
 include ../.config
-include ../.xcompile
+include ../build/xcompile
 
 ARCH-$(CONFIG_LP_ARCH_ARM)   := arm
 ARCH-$(CONFIG_LP_ARCH_X86)   := x86_32

To view, visit change 47651. To unsubscribe, or for help writing mail filters, visit settings.