SWDEV-303745 - Add new path of clangrt lib (#2385)

Change-Id: I3bfe28ac5c50884653187d733a466e661ff32f7d

bin/hipcc

@@ -146,11 +146,15 @@ $setStdLib = 0;  # TODO - set to 0
 $default_amdgpu_target = 1;
 
 if ($HIP_PLATFORM eq "amd") {
-    $HIPCC="\"$HIP_CLANG_PATH/clang++\"";
+    $execExtension = "";
+    if($isWindows) {
+        $execExtension = ".exe";
+    } 
+    $HIPCC="$HIP_CLANG_PATH/clang++" . $execExtension;
 
     # If $HIPCC clang++ is not compiled, use clang instead
     if ( ! -e $HIPCC ) {
-        $HIPCC="\"$HIP_CLANG_PATH/clang\"";
+        $HIPCC="$HIP_CLANG_PATH/clang" . $execExtension;
         $HIPLDFLAGS = "--driver-mode=g++";
     }
 
@@ -158,6 +162,9 @@ if ($HIP_PLATFORM eq "amd") {
     $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`;
+
     if (! defined $HIP_CLANG_INCLUDE_PATH) {
         $HIP_CLANG_INCLUDE_PATH = abs_path("$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/include");
     }
@@ -177,6 +184,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");
     }
 
     if ($isWindows) {
@@ -711,7 +719,12 @@ if ($HIP_PLATFORM eq "amd") {
         $toolArgs = " -Wl,--enable-new-dtags -Wl,-rpath=$HIP_LIB_PATH:$ROCM_PATH/lib -lamdhip64 " . ${toolArgs};
       }
       # To support __fp16 and _Float16, explicitly link with compiler-rt
-      $toolArgs .= " -L$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/lib/linux -lclang_rt.builtins-x86_64 "
+      $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 "
+      }
     }
 }