diff options
| author | Andres Notzli <andres.noetzli@gmail.com> | 2017-03-08 02:50:56 -0800 |
|---|---|---|
| committer | Andres Notzli <andres.noetzli@gmail.com> | 2017-03-08 10:06:13 -0800 |
| commit | b36ffd6c40b0f037e780f71a2d5c10ff53cbee14 (patch) | |
| tree | 5a8293c2cb55693f74418b794bd76125e7d1d052 /contrib | |
| parent | ab68adfc44049598ee79a3c8b4379694d786d9aa (diff) | |
Fix MinGW-w64 build
This commit fixes configure.ac to try to get clock_gettime() from
pthread. Without it, clock_gettime() is detected as missing at
configuration time for MinGW-w64 but exists at compile time, which
causes conflicts. Additionally, this commit updates the helper script
for Windows to use MinGW-w64 by default instead of MinGW.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/Makefile.am | 2 | ||||
| -rwxr-xr-x | contrib/win-build (renamed from contrib/win32-build) | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am index ad3b6f220..ff12eb7e7 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -12,7 +12,7 @@ EXTRA_DIST = \ depgraph \ get-antlr-3.4 \ mac-build \ - win32-build \ + win-build \ run-script-smtcomp2014 \ run-script-cascj7-fnt \ run-script-cascj7-fof \ diff --git a/contrib/win32-build b/contrib/win-build index 290d537eb..dee9a8af2 100755 --- a/contrib/win32-build +++ b/contrib/win-build @@ -8,7 +8,7 @@ if [ $# -ne 0 ]; then echo "usage: `basename $0`" >&2 echo >&2 - echo "This script attempts to build CVC4 for Win32 using mingw." >&2 + echo "This script attempts to build CVC4 for Win32/64 using mingw-w64." >&2 exit 1 fi @@ -18,9 +18,9 @@ if [ -z "$HOST" ]; then echo "WARNING: Using default HOST value: $HOST" echo "WARNING: You should probably run this script like this:" echo "WARNING:" - echo "WARNING: HOST=i586-mingw32msvc win32-build" + echo "WARNING: HOST=i686-w64-mingw32 win-build" echo "WARNING:" - echo "WARNING: (replacing the i586-mingw32msvc with your build host)" + echo "WARNING: (replacing the i686-w64-mingw32 with your build host)" echo "WARNING: to ensure the script builds correctly." echo "WARNING:" fi @@ -99,7 +99,7 @@ echo echo ============================================================================= echo echo 'Now just run:' -echo " ./configure --enable-static-binary --disable-shared --host=$HOST LDFLAGS=\"-L`pwd`/gmp-$GMPVERSION/lib -L`pwd`/antlr-3.4/lib -L`pwd`/boost-$BOOSTVERSION/lib\" CPPFLAGS=\"-I`pwd`/gmp-$GMPVERSION/include -I`pwd`/antlr-3.4/include -I`pwd`/boost-$BOOSTVERSION/include\" ANTLR_HOME=\"`pwd`/antlr-3.4\"" +echo " ./configure --enable-static-binary --disable-shared --host=$HOST LDFLAGS=\"-L`pwd`/gmp-$GMPVERSION/lib -L`pwd`/antlr-3.4/lib -L`pwd`/boost-$BOOSTVERSION/lib\" CPPFLAGS=\"-I`pwd`/gmp-$GMPVERSION/include -I`pwd`/antlr-3.4/include -I`pwd`/boost-$BOOSTVERSION/include\" --with-antlr-dir=\"`pwd`/antlr-3.4\" ANTLR=\"`pwd`/antlr-3.4/bin/antlr3\"" echo ' make' echo echo ============================================================================= |