Skip to content

Commit f4a1616

Browse files
authored
Merge pull request #311 from ldorau/Do_not_link_directly_with_libc
Do not link directly with libc
2 parents 3bd6e46 + 70feb9f commit f4a1616

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

src/pool/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,10 @@ endif()
3636
# libumf_pool_jemalloc
3737
if(UMF_BUILD_LIBUMF_POOL_JEMALLOC)
3838
if(LINUX)
39-
# TODO: we link directly with libc to force using malloc from glibc
40-
# This is a temporary fix for https://github.com/oneapi-src/unified-memory-framework/issues/161
4139
add_umf_library(NAME jemalloc_pool
4240
TYPE STATIC
4341
SRCS pool_jemalloc.c ${POOL_EXTRA_SRCS}
44-
LIBS c jemalloc umf_utils)
42+
LIBS jemalloc umf_utils)
4543
target_compile_definitions(jemalloc_pool PUBLIC ${POOL_COMPILE_DEFINITIONS})
4644
add_library(${PROJECT_NAME}::jemalloc_pool ALIAS jemalloc_pool)
4745
install(TARGETS jemalloc_pool

test/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,9 @@ endif()
106106

107107
if(UMF_BUILD_OS_MEMORY_PROVIDER)
108108
if(UMF_BUILD_LIBUMF_POOL_JEMALLOC)
109-
# TODO: we link directly with libc to force using malloc from glibc
110-
# This is a temporary fix for https://github.com/oneapi-src/unified-memory-framework/issues/161
111109
add_umf_test(NAME jemalloc_pool
112110
SRCS pools/jemalloc_pool.cpp malloc_compliance_tests.cpp
113-
LIBS c jemalloc_pool)
111+
LIBS jemalloc_pool)
114112
endif()
115113
else()
116114
message(STATUS "The jemalloc_pool test is DISABLED, because it uses OS_MEMORY_PROVIDER, while the UMF_BUILD_OS_MEMORY_PROVIDER option is set to OFF")

0 commit comments

Comments
 (0)