[Libreoffice-commits] core.git: external/libjpeg-turbo

[Michael Stahl]

 external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d5e8904920d4189819836f7abc002898322bb061
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Sep 18 12:56:24 2017 +0200

    libjpeg-turbo: fix 32-bit Linux build
    
    If invoked with --build=x86_64-unknown-linux-gnu, its configure will use
    the same for the host platform, so pass --host too.
    
    Change-Id: I4548c48db1811f31c7c78b2c0c74c1abb79784ba

diff --git a/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk b/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk
index 3175c433b0bf..a86b474e719e 100644
--- a/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk
+++ b/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk
@@ -26,7 +26,7 @@ $(call gb_ExternalProject_get_state_target,libjpeg-turbo,configure) :
 	$(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)) \
-			$(if $(CROSS_COMPILING),--host=$(HOST_PLATFORM)) \
+			--host=$(if $(filter WNT,$(OS)),$(if $(filter INTEL,$(CPUNAME)),i686-pc-cygwin,x86_64-pc-cygwin),$(HOST_PLATFORM)) \
 			--with-pic \
 			--enable-static \
 			--disable-shared \