summaryrefslogtreecommitdiff
path: root/external/jpeg-turbo
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-06-22 09:42:19 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-06-22 11:59:14 +0200
commite751e24250fda31dde52b3c65ca79f86142dc789 (patch)
tree243df56115fe55419a1a4919c2b94890620eda3b /external/jpeg-turbo
parenta56ca5cfed0303157d1c4c28c00545204b7b03b5 (diff)
--enable-optimized should be orthogonal to --enable-debug/--enable-dbgutil
Change-Id: I277f30129560ea9fa76d6439a60bb191358df99d Reviewed-on: https://gerrit.libreoffice.org/39088 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external/jpeg-turbo')
-rw-r--r--external/jpeg-turbo/ExternalProject_jpeg-turbo.mk2
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 f3e3945caf99..f902f25e6dee 100644
--- a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk
+++ b/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk
@@ -33,7 +33,7 @@ $(call gb_ExternalProject_get_state_target,jpeg-turbo,configure) :
--without-java \
--without-turbojpeg \
$(if $(NASM),,--without-simd) \
- CFLAGS='$(if $(debug),$(gb_DEBUGINFO_FLAGS) $(gb_DEBUG_CFLAGS),$(gb_COMPILEROPTFLAGS)) $(CFLAGS) $(gb_VISIBILITY_FLAGS)' \
+ CFLAGS='$(if $(debug),$(gb_DEBUGINFO_FLAGS) $(gb_DEBUG_CFLAGS)) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(CFLAGS) $(gb_VISIBILITY_FLAGS)' \
)
# vim: set noet sw=4 ts=4: