From 4b1d87ea9bf855cd314304966167cf88f95d973d Mon Sep 17 00:00:00 2001 From: foreman Date: Mon, 13 Apr 2015 11:54:22 -0400 Subject: [PATCH] P4 to Git Change 1140099 by lmoriche@lmoriche_opencl_dev on 2015/04/13 11:35:36 ECR #304775 - Use Clang if CPU_OPENCL_VERSION>=200 Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpudevice.cpp#272 edit --- rocclr/runtime/device/cpu/cpudevice.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rocclr/runtime/device/cpu/cpudevice.cpp b/rocclr/runtime/device/cpu/cpudevice.cpp index bd2e4d0af4..cc95884782 100644 --- a/rocclr/runtime/device/cpu/cpudevice.cpp +++ b/rocclr/runtime/device/cpu/cpudevice.cpp @@ -61,7 +61,8 @@ Device::init() const char *library = getenv("COMPILER_LIBRARY"); aclCompilerOptions opts = { sizeof(aclCompilerOptions_0_8), - library ? library : LINUX_ONLY("lib") "amdocl12cl" \ + (library || CPU_OPENCL_VERSION >= 200) + ? library : LINUX_ONLY("lib") "amdocl12cl" \ LP64_SWITCH(LINUX_SWITCH("32",""),"64") LINUX_SWITCH(".so",".dll"), NULL, NULL,