From 08177f24df2a4ae066e56af2b1f9733080d73177 Mon Sep 17 00:00:00 2001 From: Christophe Courtaut Date: Tue, 15 Oct 2013 16:23:37 +0200 Subject: [PATCH] ceph: Remove unavailable option with clang Some options are unavailable in clang. (-Wstrict-null-sentinel, -rdynamic) They were reintroduced by this commit https://github.com/ceph/ceph/commit/6949d221ada12e6be4b5ebf94b58edd17288fb16 This patch fixes it. Signed-off-by: Christophe Courtaut --- src/Makefile-env.am | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Makefile-env.am b/src/Makefile-env.am index 6a4e09512a29a..9b611596c7f28 100644 --- a/src/Makefile-env.am +++ b/src/Makefile-env.am @@ -52,7 +52,6 @@ AM_COMMON_CPPFLAGS = \ -DCEPH_LIBDIR=\"${libdir}\" AM_COMMON_CFLAGS = \ - -rdynamic \ -Wall \ ${WARN_TYPE_LIMITS} \ ${WARN_IGNORED_QUALIFIERS} \ @@ -61,6 +60,9 @@ AM_COMMON_CFLAGS = \ -Werror=format-security \ -fno-strict-aliasing \ -fsigned-char +if !CLANG + AM_COMMON_FLAGS += -rdynamic +endif AM_CFLAGS = $(AM_COMMON_CFLAGS) AM_CPPFLAGS = $(AM_COMMON_CPPFLAGS) @@ -68,8 +70,10 @@ AM_CXXFLAGS = \ @AM_CXXFLAGS@ \ $(AM_COMMON_CFLAGS) \ -Wnon-virtual-dtor \ - -Wno-invalid-offsetof \ - -Wstrict-null-sentinel + -Wno-invalid-offsetof +if !CLANG + AM_CXXFLAGS += -Wstrict-null-sentinel +endif # note: this is position dependant, it affects the -l options that # come after it on the command line. when you use ${AM_LDFLAGS} in -- 2.39.5