diff --git a/hipamd/bin/hipcc b/hipamd/bin/hipcc
index 1e5322b176..5a176dd338 100755
--- a/hipamd/bin/hipcc
+++ b/hipamd/bin/hipcc
@@ -69,10 +69,13 @@ if ($HIP_PLATFORM eq "hcc") {
     $HSA_PATH=$ENV{'HSA_PATH'};
     $HSA_PATH="/opt/rocm/hsa" unless defined $HSA_PATH;
 
-    $HCC_HOME=$ENV{'HCC_HOME'};
-    $HCC_HOME="/opt/rocm/hcc" unless defined $HCC_HOME;
-    $HCC_VERSION=`${HCC_HOME}/bin/hcc --version | cut -d" " -f9 | tr -d "\n"`;
-
+    if($hipConfig{'VALID'} == 0){
+        $HCC_HOME=$ENV{'HCC_HOME'};
+        $HCC_HOME="/opt/rocm/hcc" unless defined $HCC_HOME;
+        $HCC_VERSION=`${HCC_HOME}/bin/hcc --version | cut -d" " -f9 | tr -d "\n"`;
+    }else{
+        $HCC_HOME=$hipConfig{'HCC_HOME'};
+    }
     $ROCM_PATH=$ENV{'ROCM_PATH'};
     $ROCM_PATH="/opt/rocm" unless defined $ROCM_PATH;