external/harfbuzz/ExternalProject_harfbuzz.mk | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit d82f34a7ec478bb16d6e2c2dae562bdaead4c8d5
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Nov 1 11:50:19 2016 +0100
Forward debug/optimization flags to external/harfbuzz
Change-Id: Ie3bc54a43e46dc28faca9356f414a700a0727cec
Reviewed-on: https://gerrit.libreoffice.org/30456
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Tested-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk
b/external/harfbuzz/ExternalProject_harfbuzz.mk
index 57cfc44..ea0635d 100644
--- a/external/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/external/harfbuzz/ExternalProject_harfbuzz.mk
@@ -40,7 +40,13 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
$(if $(filter MACOSX,$(OS)),--with-coretext=yes) \
$(if
$(verbose),--disable-silent-rules,--enable-silent-rules) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
- $(if $(filter LINUX,$(OS)),CXXFLAGS="$(CXXFLAGS)
-fvisibility=hidden") \
+ CXXFLAGS=' \
+ $(if $(filter
$(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS)) \
+ $(if $(debug), \
+ $(gb_COMPILERNOOPTFLAGS)
$(gb_DEBUG_CFLAGS) \
+ $(gb_DEBUG_CXXFLAGS), \
+ $(gb_COMPILEROPTFLAGS)) \
+ $(CXXFLAGS) $(if $(filter
LINUX,$(OS)),-fvisibility=hidden)' \
&& (cd $(EXTERNAL_WORKDIR)/src && $(MAKE) lib) \
)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
