From f9db1690c3359fc30a0ab14d4e2b6cb80fdfd117 Mon Sep 17 00:00:00 2001 From: Siu Chi Chan Date: Fri, 3 Mar 2017 04:27:54 -0500 Subject: [PATCH] fix hcc version detection in hipcc Change-Id: I880be03ad67e99280a259369bfe25488bf53f0bd --- hipamd/bin/hipcc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hipamd/bin/hipcc b/hipamd/bin/hipcc index 00018e5f04..7e15d6b2e6 100755 --- a/hipamd/bin/hipcc +++ b/hipamd/bin/hipcc @@ -80,8 +80,11 @@ if ($HIP_PLATFORM eq "hcc") { $HCC_HOME=$ENV{'HCC_HOME'} // $hipConfig{'HCC_HOME'} // "/opt/rocm/hcc"; - $HCC_VERSION=`${HCC_HOME}/bin/hcc --version | cut -d" " -f9 | tr -d "\n"`; - $HCC_VERSION_MAJOR=`${HCC_HOME}/bin/hcc --version | cut -d" " -f9 | cut -d"." -f1 | tr -d "\n"`; + $HCC_VERSION=`${HCC_HOME}/bin/hcc --version`; + $HCC_VERSION=~/.*based on HCC ([^ ]+).*/; + $HCC_VERSION=$1; + $HCC_VERSION_MAJOR=$HCC_VERSION; + $HCC_VERSION_MAJOR=~s/\..*//; $ROCM_PATH=$ENV{'ROCM_PATH'} // "/opt/rocm";