X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=OvmfPkg%2Fbuild.sh;h=eb5eb7345c729a12a7eaa1c00b189cb61901b1be;hb=ca52754cfd3421648292b3764697af1735b199dd;hp=b549ab57c21a15a2163af568bd0bf3a0a173ad79;hpb=3f35b140e14cf1e95ec9621adedaa29890ac4fc9;p=mirror_edk2.git
diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh
index b549ab57c2..eb5eb7345c 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 - 2014, Intel Corporation. All rights reserved.
+# Copyright (c) 2010 - 2015, 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
@@ -61,7 +61,13 @@ case `uname` in
;;
Darwin*)
Major=$(uname -r | cut -f 1 -d '.')
+ # Major is Darwin version, not OS X version.
+ # OS X Yosemite 10.10.2 returns 14.
case $Major in
+ [156789])
+ echo OvmfPkg requires OS X Snow Leopard 10.6 or newer OS
+ exit 1
+ ;;
10)
TARGET_TOOLS=XCODE32
;;
@@ -69,8 +75,8 @@ case `uname` in
TARGET_TOOLS=XCLANG
;;
*)
- echo OvmfPkg requires Snow Leopard or later OS
- exit 1
+ # Mavericks and future assume XCODE5 (clang + lldb)
+ TARGET_TOOLS=XCODE5
;;
esac
;;
@@ -89,7 +95,7 @@ case `uname` in
4.8.*)
TARGET_TOOLS=GCC48
;;
- 4.9.*|4.1[0-9].*)
+ 4.9.*|4.1[0-9].*|5.*.*)
TARGET_TOOLS=GCC49
;;
*)
@@ -273,9 +279,8 @@ if [[ "$RUN_QEMU" == "yes" ]]; then
if [[ "$ADD_QEMU_HDA" == "yes" ]]; then
QEMU_COMMAND="$QEMU_COMMAND -hda fat:$BUILD_ROOT_ARCH"
fi
- QEMU_COMMAND="$QEMU_COMMAND $*"
- echo Running: $QEMU_COMMAND
- $QEMU_COMMAND
+ echo Running: $QEMU_COMMAND "$@"
+ $QEMU_COMMAND "$@"
exit $?
fi