changeset 4782:802777aa78d2

set llvm targets to build to X86 on all systems X86_64 failed even on a 64-bit Windows build. Huh? What?
author John W. Eaton <jwe@octave.org>
date Tue, 31 Jul 2018 07:32:47 -0400
parents 12dff80041be
children 0aaa238c8820
files src/llvm.mk
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/llvm.mk	Tue Jul 31 07:23:43 2018 -0400
+++ b/src/llvm.mk	Tue Jul 31 07:32:47 2018 -0400
@@ -26,7 +26,7 @@
         -DLLVM_BUILD_LLVM_DYLIB=On \
         -DLLVM_LINK_LLVM_DYLIB=On \
         -DLLVM_VERSION_SUFFIX= \
-        -DLLVM_TARGETS_TO_BUILD='X86_64' \
+        -DLLVM_TARGETS_TO_BUILD='X86' \
 	-DLLVM_BUILD_EXAMPLES=Off \
 	-DLLVM_INCLUDE_EXAMPLES=Off \
 	-DLLVM_BUILD_TESTS=Off \
@@ -43,9 +43,10 @@
   endif
 else
   ifeq ($(ENABLE_WINDOWS_64),yes)
+    ## WTF, setting LLVM_TARGETS_TO_BUILD to X64_64 doesn't work here?
     $(PKG)_SYSDEP_CMAKE_OPTIONS += \
       -DLLVM_DEFAULT_TARGET_TRIPLE='x86_64-pc-win32' \
-      -DLLVM_TARGETS_TO_BUILD='X86_64'
+      -DLLVM_TARGETS_TO_BUILD='X86'
   else
     $(PKG)_SYSDEP_CMAKE_OPTIONS += \
       -DLLVM_DEFAULT_TARGET_TRIPLE='x86-pc-win32' \