From fa70da22edfef15141ead632db806cbfcde67544 Mon Sep 17 00:00:00 2001
From: Aditya Atluri <Aditya.Atluri@amd.com>
Date: Tue, 21 Mar 2017 14:22:49 -0500
Subject: [PATCH] fixed paths to find llvm

Change-Id: I0a4af8cea2f44fea011d09fc300e382984746d17


[ROCm/clr commit: a19bce16e4e62cf2511cd02802bfc2517d356ed7]
---
 projects/clr/hipamd/CMakeLists.txt | 11 ++---------
 projects/clr/hipamd/bin/hipcc      |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/projects/clr/hipamd/CMakeLists.txt b/projects/clr/hipamd/CMakeLists.txt
index a1887d0cb5..93f36d97f1 100644
--- a/projects/clr/hipamd/CMakeLists.txt
+++ b/projects/clr/hipamd/CMakeLists.txt
@@ -63,14 +63,7 @@ if(HIP_PLATFORM STREQUAL "hcc")
             set(HCC_HOME $ENV{HCC_HOME} CACHE PATH "Path to which HCC has been installed")
         endif()
     endif()
-    # Determine LLVM_HOME
-    if(NOT DEFINED LLVM_HOME)
-        if(NOT DEFINED ENV{LLVM_HOME})
-            set(LLVM_HOME "/opt/rocm/llvm" CACHE PATH "Path to which LLVM has been installed")
-        else()
-            set(LLVM_HOME $ENV{LLVM_HOME} CACHE PATH "Path to which LLVM has been installed")
-        endif()
-    endif()
+
     if(DEFINED ENV{HIP_DEVELOPER})
         add_to_config(_buildInfo HCC_HOME)
     endif()
@@ -197,7 +190,7 @@ if(HIP_PLATFORM STREQUAL "hcc")
 
     execute_process(COMMAND ${HCC_HOME}/bin/hcc-config --ldflags OUTPUT_VARIABLE HCC_LD_FLAGS)
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${HCC_LD_FLAGS} -Wl,-Bsymbolic")
-    find_package(LLVM HINTS ${LLVM_HOME})
+    find_package(LLVM HINTS "/opt/rocm/llvm")
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --amdgpu-target=gfx701 --amdgpu-target=gfx801 --amdgpu-target=gfx802 --amdgpu-target=gfx803 --amdgpu-target=gfx900")
     add_library(hip_hcc SHARED ${SOURCE_FILES_RUNTIME})
     target_link_libraries(hip_hcc PRIVATE hc_am)
diff --git a/projects/clr/hipamd/bin/hipcc b/projects/clr/hipamd/bin/hipcc
index 4c71347cf7..e99be07ffd 100755
--- a/projects/clr/hipamd/bin/hipcc
+++ b/projects/clr/hipamd/bin/hipcc
@@ -103,7 +103,7 @@ if ($HIP_PLATFORM eq "hcc") {
 
     $HIPLDFLAGS = `${HCC_HOME}/bin/hcc-config --ldflags`;
 
-    $LLVM_HOME = $ENV{'LLVM_HOME'};
+    $LLVM_HOME = "/opt/rocm/llvm";
 
     #### GCC system includes workaround ####
     $HCC_WA_FLAGS = " ";