diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-11-28 16:02:43 +0100 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2017-12-04 23:30:16 +0100 |
| commit | e045e971a69f75d36069ed005d014ae3a682d944 (patch) | |
| tree | 2c41d80e7cc36acde8ef37091de2c4cc0e541f1c | |
| parent | 6fabdde7c7748ad55140f814c2eee74ccc2a0821 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 8444bf1d7314f7ff2ea4d17da19b4d276c4086ae)
Reviewed-on: https://gerrit.libreoffice.org/45768
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 2 insertions, 4 deletions
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 =================================================================== |