Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

src/CMakeLists.txt: disable -Werror on rocksdb #12560

Merged
merged 1 commit into from Jan 9, 2017

Conversation

wjwithagen
Copy link
Contributor

The Rocksdb code under Clang complains about:
/home/jenkins/workspace/ceph-master/src/rocksdb/util/thread_local.h:205:5:
error: macro expansion producing 'defined' has undefined behavior
[-Werror,-Wexpansion-to-defined]
^
/home/jenkins/workspace/ceph-master/src/rocksdb/util/thread_local.h:22:4:
note: expanded from macro 'ROCKSDB_SUPPORT_THREAD_LOCAL'
!defined(OS_WIN) && !defined(OS_MACOSX) && !defined(IOS_CROSS_COMPILE)
^`
So under Clang disable -Werror

Signed-off-by: Willem Jan Withagen wjw@digiware.nl

The Rocksdb code under Clang complains about:
/home/jenkins/workspace/ceph-master/src/rocksdb/util/thread_local.h:205:5:
  error: macro expansion producing 'defined' has undefined behavior
  [-Werror,-Wexpansion-to-defined]
    ^
/home/jenkins/workspace/ceph-master/src/rocksdb/util/thread_local.h:22:4:
  note: expanded from macro 'ROCKSDB_SUPPORT_THREAD_LOCAL'
  !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(IOS_CROSS_COMPILE)
   ^`
So under Clang disable -Werror

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
@wjwithagen wjwithagen changed the title src/CMakeLists.txt: src/CMakeLists.txt: disable -Werror on rocksdb Dec 18, 2016
@tchaikov tchaikov self-assigned this Jan 6, 2017
@@ -700,6 +700,10 @@ endif(WITH_CCACHE AND CCACHE_FOUND)
list(APPEND ROCKSDB_CMAKE_ARGS -DCMAKE_AR=${CMAKE_AR})
list(APPEND ROCKSDB_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})

if (CMAKE_CXX_COMPILER_ID STREQUAL Clang)
list(APPEND ROCKSDB_CMAKE_ARGS -DFAIL_ON_WARNINGS=OFF)
Copy link
Contributor

@tchaikov tchaikov Jan 9, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fwiw, the patch silencing the warning is posted at facebook/rocksdb#1757.

we should revert this change once patch lands on the upstream. and our rocksdb is sync'ed with upstream.

@tchaikov tchaikov merged commit 637ec53 into ceph:master Jan 9, 2017
@wjwithagen wjwithagen deleted the wip-wjw-rocksdb-NO-FAIL branch April 28, 2017 09:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants