Merge branch 'master' of https://github.com/ROCm-Developer-Tools/HIP into feature_purge_genco

2017-12-14 13:50:49 +00:00
parent 5a4955617e 9af3e027b8
commit e14ac87474
18 changed files with 34 additions and 31 deletions
@@ -167,9 +167,10 @@ if ($HIP_PLATFORM eq "hcc") {
    $CUDA_PATH=$ENV{'CUDA_PATH'} // '/usr/local/cuda';

    $HIPCC="$CUDA_PATH/bin/nvcc";
+    $HIPCXXFLAGS .= " -Wno-deprecated-gpu-targets ";
    $HIPCXXFLAGS .= " -I$CUDA_PATH/include";

-    $HIPLDFLAGS = "-lcuda -lcudart -L$CUDA_PATH/lib64";
+    $HIPLDFLAGS = " -Wno-deprecated-gpu-targets -lcuda -lcudart -L$CUDA_PATH/lib64";
 } else {
    printf ("error: unknown HIP_PLATFORM = '$HIP_PLATFORM'");
    exit (-1);