From 960d1ec4cca0adcb24ef32c58036485ccd6403fb Mon Sep 17 00:00:00 2001
From: Maneesh Gupta <maneesh.gupta@amd.com>
Date: Wed, 3 Aug 2016 09:08:40 +0530
Subject: [PATCH] Fix hipcc to work correctly when HIP_ATP_MARKER is not
 defined

Change-Id: I7cc525daccf896704e6ccf6d04ed395fda622031


[ROCm/hip commit: e818f2378d1509c07a8f46019e75781b2c13a44e]
---
 projects/hip/bin/hipcc | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/projects/hip/bin/hipcc b/projects/hip/bin/hipcc
index ce888fea8f..81d9ec62ec 100755
--- a/projects/hip/bin/hipcc
+++ b/projects/hip/bin/hipcc
@@ -57,9 +57,7 @@ if ($HIP_PLATFORM eq "hcc") {
     $ROCM_PATH="/opt/rocm" unless defined $ROCM_PATH;
 
     $HIP_ATP_MARKER=$ENV{'HIP_ATP_MARKER'};
-    if ($HIP_ATP_MARKER) {
-        $marker_path = "$ROCM_PATH/profiler/CXLActivityLogger";
-    }
+    $marker_path = "$ROCM_PATH/profiler/CXLActivityLogger";
 
     $ROCM_TARGET=$ENV{'ROCM_TARGET'};
     $ROCM_TARGET="fiji" unless defined $ROCM_TARGET;
@@ -103,11 +101,11 @@ if ($HIP_PLATFORM eq "hcc") {
         if (-e $marker_inc_path) {
             $HIPCXXFLAGS .= " -I$marker_inc_path";
         }
+    }
 
-        $marker_lib_path = "$marker_path/bin/x86_64";
-        if (-e $marker_lib_path) {
-            $HIPLDFLAGS .= " -L$marker_lib_path -lCXLActivityLogger -Wl,--rpath=$marker_lib_path";
-        }
+    $marker_lib_path = "$marker_path/bin/x86_64";
+    if (-e $marker_lib_path) {
+        $HIPLDFLAGS .= " -L$marker_lib_path -lCXLActivityLogger -Wl,--rpath=$marker_lib_path";
     }
 
     # Add C++ libs for GCC.