CMake: more MinGW fixes #2097
Closed
CMake: more MinGW fixes #2097
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Modeled after SNAPPY_ROOT_DIR. Also removes a stale comment referring to "UUID_FOUND", which isn't a thing.
Defining JEMALLOC_NO_DEMANGLE causes the preprocessor to expand various je_ symbols to the correct name, regardless of the configured prefix in the user's jemalloc installation. See https://github.com/jemalloc/jemalloc/blob/4.5.0/include/jemalloc/jemalloc_mangle.sh#L28:L34. Note that the previous use of quotes in PLATFORM_{CC,CXX}FLAGS was incorrect and caused GCC to produce the incorrect define: #define ROCKSDB_JEMALLOC -DJEMALLOC_NO_DEMANGLE 1 This was the cause of the Linux build failure on the previous version of this change.
This incorrectly exported GTEST_THROW_ON_FAILURE='1 GTEST_HAS_EXCEPTIONS=1' which did not seem to be the intent.
|
@siying has imported this pull request. If you are a Facebook employee, you can view this diff on Phabricator. |
|
@tamird thanks for fixing this. I'll merge as soon as tests pass. |
|
@siying looks like something failed, but I can't tell if it's related to this PR. |
|
Seems test failures are not related to this PR. Landing. |
mikhail-antonov
pushed a commit
to mikhail-antonov/rocksdb
that referenced
this pull request
Apr 12, 2017
Summary: siying this is a resubmission of facebook#2081 with the 4th commit fixed. From that commit message: > Note that the previous use of quotes in PLATFORM_{CC,CXX}FLAGS was incorrect and caused GCC to produce the incorrect define: > > #define ROCKSDB_JEMALLOC -DJEMALLOC_NO_DEMANGLE 1 > > This was the cause of the Linux build failure on the previous version of this change. I've tested this locally, and the Linux build succeeds now. Closes facebook#2097 Differential Revision: D4839964 Pulled By: siying fbshipit-source-id: cc51322
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@siying this is a resubmission of #2081 with the 4th commit fixed. From that commit message:
I've tested this locally, and the Linux build succeeds now.