Merge pull request #1136 from yxsamliu/fix-rdc

Fix device lib path for hip-clang.

[ROCm/clr commit: 68d30cd7e4]
This commit is contained in:
Maneesh Gupta
2019-05-24 14:16:30 +05:30
کامیت شده توسط GitHub
کامیت 0f2b9e7b30
+1 -14
مشاهده پرونده
@@ -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 {