summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTamir Duberstein <tamird@gmail.com>2017-04-04 14:53:30 -0700
committerFacebook Github Bot <facebook-github-bot@users.noreply.github.com>2017-04-04 15:09:17 -0700
commit3450ac8c1bb6a4d1714c14578271a91ec3b2a320 (patch)
tree34b91bb5d4dacac9e24d419ac272c47cc4daf47a /Makefile
parent90cfd46458d9b1a6751580cfad5c07867aba8452 (diff)
CMake: more MinGW fixes
Summary: See individual commits. yuslepukhin siying Closes https://github.com/facebook/rocksdb/pull/2081 Differential Revision: D4824639 Pulled By: IslamAbdelRahman fbshipit-source-id: 2fc2b00
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index e7959e5f1..50b026af8 100644
--- a/Makefile
+++ b/Makefile
@@ -204,8 +204,8 @@ endif
ifndef DISABLE_JEMALLOC
ifdef JEMALLOC
- PLATFORM_CXXFLAGS += "-DROCKSDB_JEMALLOC"
- PLATFORM_CCFLAGS += "-DROCKSDB_JEMALLOC"
+ PLATFORM_CXXFLAGS += "-DROCKSDB_JEMALLOC -DJEMALLOC_NO_DEMANGLE "
+ PLATFORM_CCFLAGS += "-DROCKSDB_JEMALLOC -DJEMALLOC_NO_DEMANGLE "
endif
EXEC_LDFLAGS := $(JEMALLOC_LIB) $(EXEC_LDFLAGS)
PLATFORM_CXXFLAGS += $(JEMALLOC_INCLUDE)