From 6be4c5d41d5de397a3a406d03f766cd7734742f0 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sat, 12 Feb 2022 09:25:51 +0400 Subject: [PATCH] Make jemalloc configure command nicer --- external/jemalloc/CMakeLists.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/external/jemalloc/CMakeLists.txt b/external/jemalloc/CMakeLists.txt index ff1a303..f89559a 100644 --- a/external/jemalloc/CMakeLists.txt +++ b/external/jemalloc/CMakeLists.txt @@ -33,11 +33,16 @@ endif() include(ExternalProject) ExternalProject_Add(jemalloc URL ${third_party_loc}/jemalloc - CONFIGURE_COMMAND cd "" && export EXTRA_CFLAGS=-fstack-protector-all\ -fPIC\ -D_FORTIFY_SOURCE=2 && export EXTRA_CXXFLAGS=-fstack-protector-all\ -fPIC\ -D_FORTIFY_SOURCE=2 && CC=clang CXX=clang++ ./autogen.sh + CONFIGURE_COMMAND env + CC=clang + CXX=clang++ + "EXTRA_CFLAGS=-fstack-protector-all -D_FORTIFY_SOURCE=2" + "EXTRA_CXXFLAGS=-fstack-protector-all -D_FORTIFY_SOURCE=2" + ./autogen.sh --disable-shared BUILD_IN_SOURCE 1 STEP_TARGETS build EXCLUDE_FROM_ALL TRUE - BUILD_BYPRODUCTS /lib/libjemalloc.a + BUILD_BYPRODUCTS /lib/libjemalloc_pic.a ) ExternalProject_Get_property(jemalloc SOURCE_DIR) @@ -50,7 +55,7 @@ INTERFACE target_link_libraries(external_jemalloc INTERFACE - -Wl,--push-state,--whole-archive,${SOURCE_DIR}/lib/libjemalloc.a,--pop-state,-ldl + -Wl,--push-state,--whole-archive,${SOURCE_DIR}/lib/libjemalloc_pic.a,--pop-state,-ldl ) add_dependencies(external_jemalloc jemalloc-build)