Skip to content
This repository was archived by the owner on Apr 18, 2024. It is now read-only.

Commit c69bdf1

Browse files
fix win64 issue
1 parent 1e9148e commit c69bdf1

File tree

1 file changed

+21
-0
lines changed

1 file changed

+21
-0
lines changed

build_tarballs.jl

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,27 @@ else
2525
blasldflags+=" -lopenblas"
2626
fi
2727
28+
# Patch to reverse this WIN64 change: https://github.com/cvxgrp/scs/commit/9858d6b562f499de75493b85286276c19ad84c6f#diff-a9dbab3214616022c64ee2656440f544
29+
# Looks like it is known that this change causes trouble witn mingw32 (but not for mingw64?):
30+
# https://github.com/cvxgrp/scs/blob/e6ab81db115bb37502de0a9917041a0bc2ded313/.appveyor.yml#L13-L16
31+
cd include
32+
cp glbopts.h glbopts.h.orig
33+
cat > file.patch <<'END'
34+
--- glbopts.h.orig
35+
+++ glbopts.h
36+
@@ -97,7 +97,7 @@
37+
#ifdef _WIN64
38+
/* #include <stdint.h> */
39+
/* typedef int64_t scs_int; */
40+
-typedef long scs_int;
41+
+typedef __int64 scs_int;
42+
#else
43+
typedef long scs_int;
44+
#endif
45+
END
46+
patch -l glbopts.h.orig file.patch -o glbopts.h
47+
cd ..
48+
2849
make BLASLDFLAGS="${blasldflags}" ${flags} out/libscsdir.${dlext}
2950
make BLASLDFLAGS="${blasldflags}" ${flags} out/libscsindir.${dlext}
3051
mv out/libscs* ${prefix}/lib/

0 commit comments

Comments
 (0)