Merge 'master' into 'amd-master'

Change-Id: I4c1fe6e6cc0d4eb1be5716dc013a4ecbdbbe2f8b
This commit is contained in:
Jenkins
2018-08-16 04:09:43 -05:00
+1 -1
View File
@@ -221,7 +221,7 @@ if ($HIP_PLATFORM eq "clang") {
$HIPCXXFLAGS .= " -I$HSA_PATH/include";
$HIPCXXFLAGS .= " -Wno-deprecated-register";
$HIPLDFLAGS .= " -L$HSA_PATH/lib -L$ROCM_PATH/lib -lhsa-runtime64 -lhc_am -lhsakmt ";
$HIPLDFLAGS .= " -L$HSA_PATH/lib -L$ROCM_PATH/lib -lhsa-runtime64 -lhc_am ";
# $HIPLDFLAGS .= " -L$HCC_HOME/compiler/lib -lLLVMAMDGPUDesc -lLLVMAMDGPUUtils -lLLVMMC -lLLVMCore -lLLVMSupport ";
# Add trace marker library: