From fd03c8fc183246663542cef221e343cb42612bc6 Mon Sep 17 00:00:00 2001
From: "Yaxun (Sam) Liu" <yaxun.liu@amd.com>
Date: Sun, 17 Jun 2018 12:18:37 -0400
Subject: [PATCH] Fix handling of static library in hipcc for hip-clang

---
 hipamd/bin/hipcc | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/hipamd/bin/hipcc b/hipamd/bin/hipcc
index ca504fae4e..4c526bd2c7 100755
--- a/hipamd/bin/hipcc
+++ b/hipamd/bin/hipcc
@@ -391,17 +391,20 @@ foreach $arg (@ARGV)
                     my $isObj = ($fileType =~ m/ELF/ or $fileType =~ m/COFF/);
                     $allIsObj = ($allIsObj and $isObj);
                     if ($isObj) {
-                        $realObjs = $realObjs . " " . $obj;
+                        $realObjs = ($realObjs . " " . $obj);
                     } else {
                         push (@inputs, $obj);
                         $new_arg = "$new_arg $obj";
                     }
                 }
+                chomp $realObjs;
                 if ($allIsObj) {
                     print $out "$line\n";
-                } else {
-                    system("cd $tmpdir; ar c $libFile $realObjs");
-                    print $out "$tmpdir/$libFile\n";
+                } elsif ($realObjs) {
+                    my $libBaseName = basename($libFile, ".a");
+                    $libBaseName = mktemp($libBaseName . "XXXX") . ".a";
+                    system("cd $tmpdir; ar c $libBaseName $realObjs");
+                    print $out "$tmpdir/$libBaseName\n";
                 }
             } else {
                 print $out "$line\n";