py2llvm: allow the unit test to run on Windows

m-labs · Aug 26, 2015 · 92390cf · 92390cf
1 parent d5f2f5c
commit 92390cf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/artiq/test/py2llvm.py b/artiq/test/py2llvm.py
@@ -4,6 +4,7 @@
 from fractions import Fraction
 from ctypes import CFUNCTYPE, c_int, c_int32, c_int64, c_double
 import struct
+import os
 
 import llvmlite_artiq.binding as llvm
 
@@ -16,7 +17,7 @@
 llvm.initialize()
 llvm.initialize_native_target()
 llvm.initialize_native_asmprinter()
-if struct.calcsize("P") < 8:
+if struct.calcsize("P") < 8 and os.name != "nt":
     from ctypes import _dlopen, RTLD_GLOBAL
     _dlopen("libgcc_s.so", RTLD_GLOBAL)
 

diff --git a/conda/llvmdev-or1k/bld.bat b/conda/llvmdev-or1k/bld.bat
@@ -9,7 +9,7 @@ set CMAKE_GENERATOR=Visual Studio 12 2013 Win64
 )
 set CMAKE_GENERATOR_TOOLSET=v120_xp
 @rem Reduce build times and package size by removing unused stuff
-set CMAKE_CUSTOM=-DLLVM_TARGETS_TO_BUILD=OR1K -DLLVM_INCLUDE_TESTS=OFF ^
+set CMAKE_CUSTOM=-DLLVM_TARGETS_TO_BUILD="OR1K;X86" -DLLVM_INCLUDE_TESTS=OFF ^
 -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF ^
 -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF ^
 -DLLVM_ENABLE_ASSERTIONS=ON

diff --git a/conda/llvmlite-artiq/meta.yaml b/conda/llvmlite-artiq/meta.yaml
@@ -15,7 +15,7 @@ requirements:
         - python
 
 build:
-    number: 2
+    number: 3
 
 test:
     imports: