From beb0031f4a5f631862d1d3c6ff35b7ed7355931b Mon Sep 17 00:00:00 2001
From: Yaxun Sam Liu <yaxun.liu@amd.com>
Date: Thu, 23 May 2019 15:11:02 -0400
Subject: [PATCH] Fix device lib path for hip-clang.

We now always need device lib path when compiling and not need it at linking.


[ROCm/clr commit: 636057053269840e687aa5d5441d3b1d6eb0446a]
---
 projects/clr/hipamd/bin/hipcc | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/projects/clr/hipamd/bin/hipcc b/projects/clr/hipamd/bin/hipcc
index fadc74c137..e46fe5604f 100755
--- a/projects/clr/hipamd/bin/hipcc
+++ b/projects/clr/hipamd/bin/hipcc
@@ -370,7 +370,6 @@ if($HIP_PLATFORM eq "nvcc"){
 
 my $toolArgs = "";  # arguments to pass to the hcc or nvcc tool
 my $optArg = ""; # -O args
-my $rdc = 0;
 
 foreach $arg (@ARGV)
 {
@@ -466,14 +465,6 @@ foreach $arg (@ARGV)
     {
         $optArg = $arg;
     }
-    if($arg =~ /-fgpu-rdc/)
-    {
-        $rdc = 1;
-    }
-    if($arg =~ /-fno-gpu-rdc/)
-    {
-        $rdc = 0;
-    }
 
     ## process linker response file for hip-clang
     ## extract object files from static library and pass them directly to
@@ -804,11 +795,7 @@ if ($HIP_PLATFORM eq "clang") {
         $HIPLDFLAGS .= " -O3";
     }
     $HIP_DEVLIB_FLAGS = " --hip-device-lib-path=$DEVICE_LIB_PATH";
-    if ($rdc eq 0) {
-        $HIPCXXFLAGS .= " $HIP_DEVLIB_FLAGS";
-    } else {
-        $HIPLDFLAGS .= " $HIP_DEVLIB_FLAGS";
-    }
+    $HIPCXXFLAGS .= " $HIP_DEVLIB_FLAGS";
     if ($isWindows) {
         $HIPCXXFLAGS .= " -std=c++14 -fms-extensions -fms-compatibility";
     } else {