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

diff --git a/Makefile b/Makefile
index 44a1d6319..c5ee1f29d 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)
@@ -113,7 +113,7 @@ include $(HAVE_DOTCONFIG)
 
 ifneq ($(INNER_SCANBUILD),y)
 ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y)
-CC:=clang -m32
+CC:=clang -m32 -mno-mmx -mno-sse
 HOSTCC:=clang
 endif
 endif
@@ -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))))