From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 4E68421AE30E8 for ; Thu, 1 Jun 2017 16:55:46 -0700 (PDT) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Jun 2017 16:56:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,281,1493708400"; d="scan'208";a="863717758" Received: from jljusten-skl.jf.intel.com ([10.54.75.38]) by FMSMGA003.fm.intel.com with ESMTP; 01 Jun 2017 16:56:48 -0700 From: Jordan Justen To: edk2-devel@lists.01.org Cc: Jordan Justen , Laszlo Ersek Date: Thu, 1 Jun 2017 16:56:40 -0700 Message-Id: <20170601235640.25540-2-jordan.l.justen@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170601235640.25540-1-jordan.l.justen@intel.com> References: <20170601235640.25540-1-jordan.l.justen@intel.com> Subject: [PATCH 2/2] EmulatorPkg/build.sh: Merge GCC toolchain detection from OVMF X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jun 2017 23:55:46 -0000 Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jordan Justen Cc: Laszlo Ersek --- EmulatorPkg/build.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/EmulatorPkg/build.sh b/EmulatorPkg/build.sh index 7f74391120..a196c3e9f3 100755 --- a/EmulatorPkg/build.sh +++ b/EmulatorPkg/build.sh @@ -93,6 +93,13 @@ case `uname` in gcc_version=$(gcc -v 2>&1 | tail -1 | awk '{print $3}') case $gcc_version in + [1-3].*|4.[0-3].*) + echo OvmfPkg requires GCC4.4 or later + exit 1 + ;; + 4.4.*) + TARGET_TOOLS=GCC44 + ;; 4.5.*) TARGET_TOOLS=GCC45 ;; @@ -105,11 +112,11 @@ case `uname` in 4.8.*) TARGET_TOOLS=GCC48 ;; - 4.9.*|4.1[0-9].*|5.*.*) + 4.9.*|6.[0-2].*) TARGET_TOOLS=GCC49 ;; *) - TARGET_TOOLS=GCC44 + TARGET_TOOLS=GCC5 ;; esac ;; -- 2.11.0