diff options
| author | Christophe Courtaut <christophe.courtaut@gmail.com> | 2013-10-15 16:23:37 +0200 |
|---|---|---|
| committer | Christophe Courtaut <christophe.courtaut@gmail.com> | 2013-10-17 18:00:39 +0200 |
| commit | 08177f24df2a4ae066e56af2b1f9733080d73177 (patch) | |
| tree | 97357a8e48a99868cd2853371ea877b0c8acc369 | |
| parent | ff8e6a763ab0b7a6df9c430a46b7dda4e80772c1 (diff) | |
| download | ceph-08177f24df2a4ae066e56af2b1f9733080d73177.tar.gz | |
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 <christophe.courtaut@gmail.com>
| -rw-r--r-- | src/Makefile-env.am | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/Makefile-env.am b/src/Makefile-env.am index 6a4e09512a2..9b611596c7f 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 |