diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-07-18 04:00:00 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-09-11 20:28:51 +0200 |
| commit | 0b99cceb5273550dbaef5890297fd7ebfccd6817 (patch) | |
| tree | b975c5a19d839bf3fb17912f76d75bb7943629fc /external/libjpeg-turbo | |
| parent | 1ee5147d2088606492de65bd8084a44db537b5c9 (diff) | |
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 <glogow@fbihome.de>
Diffstat (limited to 'external/libjpeg-turbo')
| -rw-r--r-- | external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk | 4 |
1 files changed, 2 insertions, 2 deletions
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 \ |