From b36ffd6c40b0f037e780f71a2d5c10ff53cbee14 Mon Sep 17 00:00:00 2001 From: Andres Notzli Date: Wed, 8 Mar 2017 02:50:56 -0800 Subject: [PATCH] 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. --- configure.ac | 2 +- contrib/Makefile.am | 2 +- contrib/{win32-build => win-build} | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) rename contrib/{win32-build => win-build} (91%) diff --git a/configure.ac b/configure.ac index 3d645b24e..d2c08661b 100644 --- a/configure.ac +++ b/configure.ac @@ -999,7 +999,7 @@ fi # Checks for libraries. -AC_SEARCH_LIBS([clock_gettime], [rt], +AC_SEARCH_LIBS([clock_gettime], [rt pthread], [AC_DEFINE([HAVE_CLOCK_GETTIME], [1], [Defined to 1 if clock_gettime() is supported by the platform.])], [AC_LIBOBJ([clock_gettime])]) 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 similarity index 91% rename from contrib/win32-build rename to 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 ============================================================================= -- 2.30.2