summaryrefslogtreecommitdiff
path: root/external/harfbuzz
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/harfbuzz
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/harfbuzz')
-rw-r--r--external/harfbuzz/ExternalProject_harfbuzz.mk7
1 files changed, 3 insertions, 4 deletions
diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk
index e98cc03bb80a..839bf49ff50d 100644
--- a/external/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/external/harfbuzz/ExternalProject_harfbuzz.mk
@@ -43,10 +43,9 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
CXXFLAGS=' \
$(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS)) \
- $(if $(debug), \
- $(gb_COMPILERNOOPTFLAGS) $(gb_DEBUG_CFLAGS) \
- $(gb_DEBUG_CXXFLAGS), \
- $(gb_COMPILEROPTFLAGS)) \
+ $(if $(ENABLE_OPTIMIZED), \
+ $(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
+ $(if $(debug),$(gb_DEBUG_CFLAGS) $(gb_DEBUG_CXXFLAGS)) \
$(CXXFLAGS) \
$(ICU_UCHAR_TYPE) \
$(if $(filter LINUX,$(OS)),-fvisibility=hidden)' \