P4 to Git Change 1180135 by yaxunl@yaxunl_stg_win50 on 2015/08/13 13:24:11

ECR #354633 - SPIR-V: Fix build failure in mainline.

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/linker.cpp#132 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/build/Makefile.complib#89 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/Makefile#53 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Makefile#26 edit


[ROCm/clr commit: 97f6edabb3]

projects/clr/rocclr/compiler/lib/backends/common/linker.cpp

@@ -14,7 +14,7 @@
 #include "utils/target_mappings.h"
 
 #include "acl.h"
-#if !(defined(LEGACY_COMPLIB) || defined(MAIN_LINE))
+#if !defined(LEGACY_COMPLIB)
 #define HAS_SPIRV
 #endif