From e045e971a69f75d36069ed005d014ae3a682d944 Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Tue, 28 Nov 2017 16:02:43 +0100 Subject: Remove arch-pinning for gpgme on Windows again With e0d94237878d4949573fc9b6d97eea3146cada6d the dependency on gcc is gone, so we should be able to build on all cygwin flavours again for all Windows arch targets. Well almost - we still have windres on cygwin32 only able to produce pe-i386 targets, so let's exclude the case cyg32 and WIN64 for the moment. Change-Id: Ibe7f967585995586985177d4c36cc33d9850d9de Reviewed-on: https://gerrit.libreoffice.org/45422 Tested-by: Jenkins Reviewed-by: Thorsten Behrens (cherry picked from commit 8444bf1d7314f7ff2ea4d17da19b4d276c4086ae) Reviewed-on: https://gerrit.libreoffice.org/45768 Reviewed-by: Katarina Behrens --- configure.ac | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 20a730cb8678..d0caf9491ef1 100644 --- a/configure.ac +++ b/configure.ac @@ -10138,11 +10138,9 @@ fi AC_SUBST(ENABLE_PDFIUM) SYSTEM_GPGMEPP= -# need matching cygwin arch for building gpgme sadly, for the while if test "$_os" = "Linux" -o "$_os" = "Darwin" \ - -o \( "$_os" = "WINNT" -a "$host_cpu" = "i686" -a "$WINDOWS_SDK_ARCH" = "x86" \) \ - -o \( "$_os" = "WINNT" -a "$host_cpu" = "x86_64" -a "$WINDOWS_SDK_ARCH" = "x64" \) ; then - + -o \( "$_os" = "WINNT" -a "$host_cpu" = "x86_64" \) \ + -o \( "$_os" = "WINNT" -a "$host_cpu" = "i686" -a "$WINDOWS_SDK_ARCH" = "x86" \) ; then dnl =================================================================== dnl Check for system gpgme dnl =================================================================== -- cgit