external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0b99cceb5273550dbaef5890297fd7ebfccd6817
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Sat Jul 18 04:00:00 2020 +0200
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Fri Sep 11 20:28:51 2020 +0200
WIN cross: fix libjpeg-turbo build
Change-Id: Iae4696df714ba27c0053f7ca3eb485816e8e58c7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102481
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
diff --git a/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk
b/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk
index a6c8f0d77a2f..a5cd4c57ddc7 100644
--- a/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk
+++ b/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk
@@ -28,8 +28,8 @@ $(call
gb_ExternalProject_get_state_target,libjpeg-turbo,configure) :
$(call gb_Trace_StartRange,libjpeg-turbo,EXTERNAL)
$(call gb_ExternalProject_run,configure,\
MAKE=$(MAKE) ./configure \
- --build=$(if $(filter WNT,$(OS)),$(if $(filter
INTEL,$(CPUNAME)),i686-pc-cygwin,x86_64-pc-cygwin),$(BUILD_PLATFORM)) \
- --host=$(if $(filter WNT,$(OS)),$(if $(filter
INTEL,$(CPUNAME)),i686-pc-cygwin,x86_64-pc-cygwin),$(HOST_PLATFORM)) \
+ --build=$(BUILD_PLATFORM) \
+ --host=$(HOST_PLATFORM) \
--with-pic \
--enable-static \
--disable-shared \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
