diff options
| author | Tamir Duberstein <tamird@gmail.com> | 2017-04-06 13:54:49 -0700 |
|---|---|---|
| committer | Facebook Github Bot <facebook-github-bot@users.noreply.github.com> | 2017-04-06 14:09:13 -0700 |
| commit | 107c5f6a60e94c3cf478ee25e50164fd31b014b0 (patch) | |
| tree | 2bb9ceae01b7d06be6dd4d05e829d036888e80f0 /examples | |
| parent | d2dce5611ab4b9a671ef518f648adf84d49e5356 (diff) | |
CMake: more MinGW fixes
Summary:
siying this is a resubmission of #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 https://github.com/facebook/rocksdb/pull/2097
Differential Revision: D4839964
Pulled By: siying
fbshipit-source-id: cc51322
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/Makefile b/examples/Makefile index 3b302ac09..a3a786e83 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -2,7 +2,7 @@ include ../make_config.mk ifndef DISABLE_JEMALLOC ifdef JEMALLOC - PLATFORM_CXXFLAGS += "-DROCKSDB_JEMALLOC" + PLATFORM_CXXFLAGS += -DROCKSDB_JEMALLOC -DJEMALLOC_NO_DEMANGLE endif EXEC_LDFLAGS := $(JEMALLOC_LIB) $(EXEC_LDFLAGS) -lpthread PLATFORM_CXXFLAGS += $(JEMALLOC_INCLUDE) |