Fix a latent bug discovered by r366610: nativecodegen includes X86CodeGen when X86...
authorDaniel Sanders <daniel_l_sanders@apple.com>
Fri, 19 Jul 2019 20:58:11 +0000 (20:58 +0000)
committerDaniel Sanders <daniel_l_sanders@apple.com>
Fri, 19 Jul 2019 20:58:11 +0000 (20:58 +0000)
I believe this to have been a latent bug as the same expansion checks for the
existence of ${native_tgt}Info and ${native_tgt}Desc and only adds them if
they were compiled but unconditionally adds ${native_tgt}CodeGen.

This should fix llvm-clang-x86_64-win-fast which builds ARM only on an X86 host and similar builders.

llvm-svn: 366612

llvm/cmake/modules/LLVM-Config.cmake

index f29dacb..614f55d 100644 (file)
@@ -154,7 +154,9 @@ function(llvm_expand_pseudo_components out_components)
         list(APPEND expanded_components "${c}Utils")
       endif()
     elseif( c STREQUAL "nativecodegen" )
-      list(APPEND expanded_components "${LLVM_NATIVE_ARCH}CodeGen")
+      if( TARGET LLVM${LLVM_NATIVE_ARCH}CodeGen )
+        list(APPEND expanded_components "${LLVM_NATIVE_ARCH}CodeGen")
+      endif()
       if( TARGET LLVM${LLVM_NATIVE_ARCH}Desc )
         list(APPEND expanded_components "${LLVM_NATIVE_ARCH}Desc")
       endif()