diff --git a/bin/hipcc b/bin/hipcc
index 00018e5f04..7e15d6b2e6 100755
--- a/bin/hipcc
+++ b/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";