X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=OvmfPkg%2Fbuild.sh;h=28c7d3831343feb71a62d4ca8ef9c5a07110b5ad;hb=1f728ac751c2c7349d28a5b6c67ab7eeedf37157;hp=0ddef044c0f7e3170cd2f5be5399277f9b6e94e0;hpb=66325870afafef6bf221fc3cc214f208b281652b;p=mirror_edk2.git

diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh
index 0ddef044c0..28c7d38313 100755
--- a/OvmfPkg/build.sh
+++ b/OvmfPkg/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
-# Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
 #
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions of the BSD License
@@ -44,6 +44,7 @@ fi
 PROCESSOR=X64
 BUILDTARGET=DEBUG
 BUILD_OPTIONS=
+PLATFORMFILE=
 LAST_ARG=
 RUN_QEMU=no
 
@@ -66,8 +67,18 @@ case `uname` in
       fi
       ;;
   Linux*)
-    TARGET_TOOLS=GCC44
-    ;;
+    gcc_version=$(gcc -v 2>&1 | tail -1 | awk '{print $3}')
+    case $gcc_version in
+      4.5.*)
+        TARGET_TOOLS=GCC45
+        ;;
+      4.6.*)
+        TARGET_TOOLS=GCC46
+        ;;
+      *)
+        TARGET_TOOLS=GCC44
+        ;;
+    esac
 esac
 
 #
@@ -78,7 +89,7 @@ for arg in "$@"
 do
   if [ -z "$LAST_ARG" ]; then
     case $arg in
-      -a|-b|-t)
+      -a|-b|-t|-p)
         LAST_ARG=$arg
         ;;
       qemu)
@@ -98,6 +109,9 @@ do
       -b)
         BUILDTARGET=$arg
         ;;
+      -p)
+        PLATFORMFILE=$arg
+        ;;
       -t)
         TARGET_TOOLS=$arg
         ;;
@@ -126,6 +140,10 @@ case $PROCESSOR in
     ;;
 esac
 
+if [ -z "$PLATFORMFILE" ]; then
+  PLATFORMFILE=$WORKSPACE/OvmfPkg/OvmfPkg$Processor.dsc
+fi
+
 ADD_QEMU_HDA=yes
 for arg in "$@"
 do
@@ -171,9 +189,9 @@ fi
 if [[ "$RUN_QEMU" == "yes" ]]; then
   if [[ ! -d $QEMU_FIRMWARE_DIR ]]; then
     mkdir $QEMU_FIRMWARE_DIR
-    ln -s $FV_DIR/OVMF.fd $QEMU_FIRMWARE_DIR/bios.bin
-    ln -s $FV_DIR/CirrusLogic5446.rom $QEMU_FIRMWARE_DIR/vgabios-cirrus.bin
   fi
+  ln -sf $FV_DIR/OVMF.fd $QEMU_FIRMWARE_DIR/bios.bin
+  ln -sf $FV_DIR/OvmfVideo.rom $QEMU_FIRMWARE_DIR/vgabios-cirrus.bin
   if [[ "$ADD_QEMU_HDA" == "yes" ]]; then
     AUTO_QEMU_HDA="-hda fat:$BUILD_ROOT_ARCH"
   else
@@ -189,6 +207,6 @@ fi
 # Build the edk2 OvmfPkg
 #
 echo Running edk2 build for OvmfPkg$Processor
-build -p $WORKSPACE/OvmfPkg/OvmfPkg$Processor.dsc $BUILD_OPTIONS -a $PROCESSOR -b $BUILDTARGET -t $TARGET_TOOLS
+build -p $PLATFORMFILE $BUILD_OPTIONS -a $PROCESSOR -b $BUILDTARGET -t $TARGET_TOOLS
 exit $?