X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile;h=f2277d16463fda937034f54779b816c3ed285d69;hb=399fcdd40d24e7f6fed80e5e1493c900be2b3772;hp=44a1d63198077dede020918fedc52e1bb3da00cb;hpb=3bda0443bad79db3aff190b792ed2976467091aa;p=coreboot.git

diff --git a/Makefile b/Makefile
index 44a1d6319..f2277d164 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ ifeq ($(INNER_SCANBUILD),y)
 CC_real:=$(CC)
 endif
 
-$(if $(wildcard .xcompile),,$(eval $(shell bash util/xcompile/xcompile > .xcompile)))
+$(if $(wildcard .xcompile),,$(eval $(shell bash util/xcompile/xcompile $(XGCCPATH) > .xcompile)))
 include .xcompile
 
 ifeq ($(INNER_SCANBUILD),y)
@@ -204,6 +204,9 @@ evaluate_subdirs= \
 subdirs:=$(TOPLEVEL)
 $(eval $(call evaluate_subdirs))
 
+# Eliminate duplicate mentions of source files in a class
+$(foreach class,$(classes),$(eval $(class)-srcs:=$(sort $($(class)-srcs))))
+
 src-to-obj=$(addsuffix .$(1).o, $(basename $(patsubst src/%, $(obj)/%, $($(1)-srcs))))
 $(foreach class,$(classes),$(eval $(class)-objs:=$(call src-to-obj,$(class))))