X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;ds=sidebyside;f=OvmfPkg%2Fbuild.sh;h=6821742e7acdb426bd9e5bb769f883e6aa48b481;hb=5866d49923967b86e2921672cd83b3f506b45e3d;hp=920d22f217573b99fc003ee32d8038c8ab6b1c93;hpb=cbe2e9ee553075793559ab55fe7358a7b84ab97e;p=mirror_edk2.git
diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh
index 920d22f217..6821742e7a 100755
--- a/OvmfPkg/build.sh
+++ b/OvmfPkg/build.sh
@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
-# Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.
+# Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -83,23 +83,18 @@ case `uname` in
Linux*)
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
- ;;
- 4.7.*)
- TARGET_TOOLS=GCC47
+ [1-3].*|4.[0-7].*)
+ echo OvmfPkg requires GCC4.8 or later
+ exit 1
;;
4.8.*)
TARGET_TOOLS=GCC48
;;
- 4.9.*|4.1[0-9].*)
+ 4.9.*|6.[0-2].*)
TARGET_TOOLS=GCC49
;;
*)
- TARGET_TOOLS=GCC44
+ TARGET_TOOLS=GCC5
;;
esac
esac
@@ -216,7 +211,9 @@ if [ -z "$PLATFORMFILE" ]; then
fi
if [[ "$RUN_QEMU" == "yes" ]]; then
- qemu_version=$($QEMU_COMMAND -version 2>&1 | tail -1 | awk '{print $4}')
+ qemu_version=$($QEMU_COMMAND -version 2>&1 | \
+ grep -o -E 'version [0-9]+\.[0-9]+\.[0-9]+' | \
+ awk '{print $2}')
case $qemu_version in
1.[6-9].*|1.[1-9][0-9].*|2.*.*)
ENABLE_FLASH=yes