diff -r f165d51985d1 tools/firmware/ovmf-makefile
--- a/tools/firmware/ovmf-makefile	Thu Mar 22 14:26:47 2012 +0000
+++ b/tools/firmware/ovmf-makefile	Fri Mar 23 12:55:54 2012 +0000
@@ -10,8 +10,17 @@ all: ovmf.bin
 .PHONY: ovmf.bin
 ovmf.bin:
 	OvmfPkg/build.sh -a X64
-	cp Build/OvmfX64/DEBUG_GCC44/FV/OVMF.fd ovmf.bin
+	if test -e Build/OvmfX64/DEBUG_GCC46/FV/OVMF.fd ; then \
+		cp Build/OvmfX64/DEBUG_GCC46/FV/OVMF.fd ovmf.bin; \
+	else if test -e Build/OvmfX64/DEBUG_GCC45/FV/OVMF.fd ; then \
+		cp Build/OvmfX64/DEBUG_GCC45/FV/OVMF.fd ovmf.bin; \
+	else if test -e Build/OvmfX64/DEBUG_GCC44/FV/OVMF.fd ; then \
+		cp Build/OvmfX64/DEBUG_GCC44/FV/OVMF.fd ovmf.bin; \
+	else \
+		echo "ovmf.bin not found!" \
+	endif
 
 .PHONY: clean
 clean:
-	rm -rf ovmf.bin Build/*
+	make clean -C BaseTools/
+	rm -rf Build/*