Kaydet (Commit) 13223068 authored tarafından Luboš Luňák's avatar Luboš Luňák

prevent cairo from using -flto with clang, cairo uses it incorrectly

The option should be used also at link time (as e.g. the gcc man page says),
but cairo doesn't do so, and since -flto makes clang generate .o with LLVM
bytecode, plain ld chokes on it.

Change-Id: Ia5ce9a98afa4f88b8d0943a5971450d7009af913
üst d82e1f1a
......@@ -41,4 +41,10 @@ ifneq (,$(filter ANDROID IOS,$(OS)))
$(eval $(call gb_UnpackedTarball_add_file,cairo,.,cairo/cairo/dummy_pkg_config))
endif
ifeq ($(COM_GCC_IS_CLANG),TRUE)
$(eval $(call gb_UnpackedTarball_add_patches,cairo,\
cairo/cairo/no-flto-clang.patch \
))
endif
# vim: set noet sw=4 ts=4:
--- misc/cairo-1.10.2/configure.sav 2013-06-26 15:00:42.000000000 +0200
+++ misc/cairo-1.10.2/configure 2013-06-26 15:03:36.995117032 +0200
@@ -17236,7 +17236,7 @@ MAYBE_WARN="-Wall -Wextra \
MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \
-erroff=E_ENUM_TYPE_MISMATCH_OP"
-MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common -flto"
+MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment