Index: libclc/CMakeLists.txt
===================================================================
--- libclc/CMakeLists.txt
+++ libclc/CMakeLists.txt
@@ -213,11 +213,11 @@
 
        # Add the generated convert.cl here to prevent adding
        # the one listed in SOURCES
-       if( NOT ${ARCH} STREQUAL "spirv" AND NOT ${ARCH} STREQUAL "spirv64" AND
-                       NOT ${ARCH} STREQUAL "clspv" AND NOT ${ARCH} STREQUAL "clspv64" )
+       if( NOT ${ARCH} STREQUAL "spirv" AND NOT ${ARCH} STREQUAL "spirv64")
                set( rel_files convert.cl )
                set( objects convert.cl )
-               if( NOT ENABLE_RUNTIME_SUBNORMAL )
+               if( NOT ENABLE_RUNTIME_SUBNORMAL AND NOT ${ARCH} STREQUAL "clspv" AND
+                   NOT ${ARCH} STREQUAL "clspv64")
                        list( APPEND rel_files generic/lib/subnormal_use_default.ll )
                endif()
        else()