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

@@ -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,