diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2015-02-03 13:13:55 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-02-04 13:15:09 +0000 |
| commit | ee457ab6304f16cdd76a9723368c314dc5a75c55 (patch) | |
| tree | 4e5e15277fea4186912107fda8d4fcb76a2071b5 /external/jpeg-turbo | |
| parent | 8b12e63b60530a2ad3769bc4983cc09bedd34c79 (diff) | |
Fix jpeg-turbo on windows 64 bit
This fix supports building jpeg-turbo on both cygwin 32 nd 64 bit.
When only cygwin 64 bit is used, then it can be simplified by
passing BUILD_PLATFORM to configure script on all platforms.
Change-Id: Id335282f1761fcf7313fb18a6b9250e5eac392e4
Reviewed-on: https://gerrit.libreoffice.org/14315
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external/jpeg-turbo')
| -rwxr-xr-x[-rw-r--r--] | external/jpeg-turbo/ExternalProject_jpeg-turbo.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk b/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk index d9ac7e56d0e4..ad35a6f6c000 100644..100755 --- a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk +++ b/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk @@ -25,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,jpeg-turbo,build) : $(call gb_Externa $(call gb_ExternalProject_get_state_target,jpeg-turbo,configure) : $(call gb_ExternalProject_run,configure,\ MAKE=$(MAKE) ./configure \ - --build=$(if $(filter WNT,$(OS)),i686-pc-cygwin,$(BUILD_PLATFORM)) \ + --build=$(if $(filter WNT,$(OS)),$(if $(filter INTEL,$(CPU)),i686-pc-cygwin,x86_64-pc-cygwin),$(BUILD_PLATFORM)) \ --with-pic \ --enable-static \ --disable-shared \ |