diff --git a/cmake/cmake.define b/cmake/cmake.define index a794d927ad..c9e63aa268 100644 --- a/cmake/cmake.define +++ b/cmake/cmake.define @@ -257,4 +257,9 @@ ELSE() SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -g3 -gdwarf-2 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reserved-user-defined-literal -g3 -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k") ENDIF() + + IF(${JEMALLOC_ENABLED}) + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=attributes") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=attributes") + ENDIF() ENDIF() diff --git a/source/dnode/mgmt/exe/dmMain.c b/source/dnode/mgmt/exe/dmMain.c index b5eeb78b5e..ce1c409bfb 100644 --- a/source/dnode/mgmt/exe/dmMain.c +++ b/source/dnode/mgmt/exe/dmMain.c @@ -21,13 +21,15 @@ #include "tglobal.h" #include "version.h" #include "tconv.h" -#ifdef TD_JEMALLOC_ENABLED -#include "jemalloc/jemalloc.h" -#endif #include "dmUtil.h" #include "tcs.h" #include "qworker.h" +#ifdef TD_JEMALLOC_ENABLED +#define ALLOW_FORBID_FUNC +#include "jemalloc/jemalloc.h" +#endif + #if defined(CUS_NAME) || defined(CUS_PROMPT) || defined(CUS_EMAIL) #include "cus_name.h" #else