From fd8795f3874d623db7a82bec56904648fe2c1eb7 Mon Sep 17 00:00:00 2001 From: Robert Fairley Date: Wed, 19 Jun 2019 13:32:00 -0400 Subject: [PATCH] Makefile-libostree.am: Work around clang issues with g-ir-scanner Work around an issue with clang-7 in Fedora 29 where the `-fstack-clash-protection` flag is not recognized. Force the compiler used by `g-ir-scanner` to `gcc`, so that the flag is recognized. Related: https://github.com/projectatomic/rpm-ostree/pull/1787#issuecomment-473971585 Closes: #1871 Approved by: jlebon --- Makefile-libostree.am | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile-libostree.am b/Makefile-libostree.am index 0ea54cf8..1f1e0bc7 100644 --- a/Makefile-libostree.am +++ b/Makefile-libostree.am @@ -251,6 +251,10 @@ libostree_1_la_CFLAGS += $(OT_DEP_SELINUX_CFLAGS) libostree_1_la_LIBADD += $(OT_DEP_SELINUX_LIBS) endif +# XXX: work around clang being passed -fstack-clash-protection which it doesn't understand +# See: https://bugzilla.redhat.com/show_bug.cgi?id=1672012 +INTROSPECTION_SCANNER_ENV = CC=gcc + if BUILDOPT_INTROSPECTION OSTree-1.0.gir: libostree-1.la Makefile OSTree_1_0_gir_EXPORT_PACKAGES = ostree-1