diff --git a/projects/hip/bin/hipcc.pl b/projects/hip/bin/hipcc.pl
index 2dd7c248ef..dedfc58648 100755
--- a/projects/hip/bin/hipcc.pl
+++ b/projects/hip/bin/hipcc.pl
@@ -160,7 +160,7 @@ if ($HIP_PLATFORM eq "amd") {
     $execExtension = "";
     if($isWindows) {
         $execExtension = ".exe";
-    } 
+    }
     $HIPCC="$HIP_CLANG_PATH/clang++" . $execExtension;
 
     # If $HIPCC clang++ is not compiled, use clang instead
@@ -173,13 +173,10 @@ if ($HIP_PLATFORM eq "amd") {
         $HIPLDFLAGS .= " -fuse-ld=lld";
         $HIPLDFLAGS .= " --ld-path=$HIP_CLANG_PATH/lld-link.exe";
     }
-    $HIP_CLANG_VERSION = `$HIPCC --version`;
-    $HIP_CLANG_VERSION=~/.*clang version (\S+).*/;
-    $HIP_CLANG_VERSION=$1;
 
-    # Figure out the target with which llvm is configured
-    $HIP_CLANG_TARGET = `$HIPCC -print-target-triple`;
-    chomp($HIP_CLANG_TARGET);
+    # get Clang RT Builtin path 
+    $HIP_CLANG_RT_LIB = `$HIPCC --print-runtime-dir`;
+    chomp($HIP_CLANG_RT_LIB);
 
     if (! defined $HIP_INCLUDE_PATH) {
         $HIP_INCLUDE_PATH = "$HIP_PATH/include";
@@ -196,7 +193,7 @@ if ($HIP_PLATFORM eq "amd") {
         print ("HIP_INCLUDE_PATH=$HIP_INCLUDE_PATH\n");
         print ("HIP_LIB_PATH=$HIP_LIB_PATH\n");
         print ("DEVICE_LIB_PATH=$DEVICE_LIB_PATH\n");
-        print ("HIP_CLANG_TARGET=$HIP_CLANG_TARGET\n");
+        print ("HIP_CLANG_RT_LIB=$HIP_CLANG_RT_LIB\n");
     }
 
     $HIPLDFLAGS .= " -L\"$HIP_LIB_PATH\"";
@@ -598,13 +595,8 @@ if ($HIP_PLATFORM eq "amd") {
       } else {
         $toolArgs = ${toolArgs} . " -Wl,-rpath=$HIP_LIB_PATH:$ROCM_PATH/lib -lamdhip64 ";
       }
-      # To support __fp16 and _Float16, explicitly link with compiler-rt
-      $HIP_CLANG_BUILTIN_LIB="$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/lib/$HIP_CLANG_TARGET/libclang_rt.builtins.a";
-      if (-e $HIP_CLANG_BUILTIN_LIB) {
-        $toolArgs .= " -L$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/lib/$HIP_CLANG_TARGET -lclang_rt.builtins "
-      } else {
-        $toolArgs .= " -L$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/lib/linux -lclang_rt.builtins-x86_64 "
-      }
+
+      $toolArgs .= " -L$HIP_CLANG_RT_LIB -lclang_rt.builtins-x86_64 "
     }
 }
 
diff --git a/projects/hip/bin/hipconfig.pl b/projects/hip/bin/hipconfig.pl
index 5ddb8e9b7d..dd03ad67a8 100755
--- a/projects/hip/bin/hipconfig.pl
+++ b/projects/hip/bin/hipconfig.pl
@@ -46,7 +46,6 @@ $CUDA_PATH      =   $hipvars::CUDA_PATH;
 $HIP_PATH       =   $hipvars::HIP_PATH;
 $ROCM_PATH      =   $hipvars::ROCM_PATH;
 $HIP_VERSION    =   $hipvars::HIP_VERSION;
-$HSA_PATH       =   $hipvars::HSA_PATH;
 
 Getopt::Long::Configure ( qw{bundling no_ignore_case});
 GetOptions(
@@ -81,7 +80,7 @@ if ($HIP_COMPILER eq "clang") {
     if($isWindows) {
         $CPP_CONFIG .= " -I\"$HIP_PATH_INCLUDE\" -I\"$HIP_CLANG_INCLUDE\"";
     } else {
-        $CPP_CONFIG .= " -I$HIP_PATH_INCLUDE -I$HIP_CLANG_INCLUDE -I$HSA_PATH/include";
+        $CPP_CONFIG .= " -I$HIP_PATH_INCLUDE -I$HIP_CLANG_INCLUDE ";
     }
 }
 if ($HIP_PLATFORM eq "nvidia") {
@@ -162,9 +161,6 @@ if (!$printed or $p_full) {
         if ($HIP_COMPILER eq "clang")
         {
             print "== hip-clang\n";
-            if (not $isWindows) {
-                print ("HSA_PATH         : $HSA_PATH\n");
-            }
             print ("HIP_CLANG_PATH   : $HIP_CLANG_PATH\n");
             if ($isWindows) {
                 system("\"$HIP_CLANG_PATH/clang++\" --version");
@@ -201,10 +197,10 @@ if (!$printed or $p_full) {
     print "=== Environment Variables\n";
     if ($isWindows) {
         print ("PATH=$ENV{PATH}\n");
-        system("set | findstr //B //C:\"HIP\" //C:\"HSA\" //C:\"CUDA\" //C:\"LD_LIBRARY_PATH\"");
+        system("set | findstr //B //C:\"HIP\" //C:\"CUDA\" //C:\"LD_LIBRARY_PATH\"");
     } else {
         system("echo PATH=\$PATH");
-        system("env | egrep '^HIP|^HSA|^CUDA|^LD_LIBRARY_PATH'");
+        system("env | egrep '^HIP|^CUDA|^LD_LIBRARY_PATH'");
     }
 
 
@@ -238,18 +234,6 @@ if ($p_check) {
     } else {
         printf "good\n";
     }
-
-    if ($HIP_PLATFORM eq "amd")  {
-        $LD_LIBRARY_PATH=$ENV{'LD_LIBRARY_PATH'};
-        printf("%-70s", "check LD_LIBRARY_PATH ($LD_LIBRARY_PATH) contains HSA_PATH ($HSA_PATH)...");
-        if (index($LD_LIBRARY_PATH, $HSA_PATH) == -1) {
-            print "FAIL\n";
-        } else {
-            printf "good\n";
-        }
-
-        # TODO - check hipcc / nvcc found and executable.
-    }
 }
 
 if ($p_newline) {