diff options
| author | Sage Weil <sage@inktank.com> | 2013-10-18 18:41:13 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-10-18 18:41:13 -0700 |
| commit | 4d3502ba9b310cddcd8325da4b08adee26587143 (patch) | |
| tree | ac34f99e5275f02ce6133d42f93a244a17612378 | |
| parent | 1203a9a6e99f6a0d610dd781fff6593d10175f8d (diff) | |
| parent | 08177f24df2a4ae066e56af2b1f9733080d73177 (diff) | |
| download | ceph-4d3502ba9b310cddcd8325da4b08adee26587143.tar.gz | |
Merge pull request #734 from kri5/master
ceph: Remove unavailable option with clang
Reviewed-by: Sage Weil <sage@inktank.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 9bc6ee74db3..6b2c2fcc5df 100644 --- a/src/Makefile-env.am +++ b/src/Makefile-env.am @@ -57,7 +57,6 @@ AM_COMMON_CPPFLAGS = \ -DCEPH_LIBDIR=\"${libdir}\" AM_COMMON_CFLAGS = \ - -rdynamic \ -Wall \ ${WARN_TYPE_LIMITS} \ ${WARN_IGNORED_QUALIFIERS} \ @@ -66,6 +65,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) @@ -73,8 +75,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 |