Skip to content

Commit c4f00e1

Browse files
committed
luzer: use CMAKE_SHARED_LIBRARY_SUFFIX
The patch replace static suffix ".so" for shared libraries with CMAKE_SHARED_LIBRARY_SUFFIX [1]. Needed for the following patch with macOS support. Needed for #59 1. https://cmake.org/cmake/help/latest/variable/CMAKE_SHARED_LIBRARY_SUFFIX.html
1 parent 3e47dc3 commit c4f00e1

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

cmake/BuildLibSanitizers.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ list(APPEND LIBCLANG_UBSAN_STRIP
5656
ubsan_init_standalone_preinit.cpp.o
5757
)
5858

59-
set(ASAN_DSO "libfuzzer_with_asan.so")
60-
set(UBSAN_DSO "libfuzzer_with_ubsan.so")
59+
set(ASAN_DSO "libfuzzer_with_asan${CMAKE_SHARED_LIBRARY_SUFFIX}")
60+
set(UBSAN_DSO "libfuzzer_with_ubsan${CMAKE_SHARED_LIBRARY_SUFFIX}")
6161

6262
GEN_BUILD_TARGET("asan"
6363
${LIBCLANG_ASAN_LIB}

luzer/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ install(
9090
TARGETS luzer_impl
9191
LIBRARY
9292
DESTINATION "${CMAKE_LIBDIR}/"
93-
RENAME luzer.so
93+
RENAME luzer${CMAKE_SHARED_LIBRARY_SUFFIX}
9494
)
9595

9696
install(

luzer/tests/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include(MakeLuaPath)
22

33
make_lua_path(LUA_CPATH
44
PATHS
5-
${PROJECT_BINARY_DIR}/luzer/?.so
5+
${PROJECT_BINARY_DIR}/luzer/?${CMAKE_SHARED_LIBRARY_SUFFIX}
66
)
77

88
make_lua_path(LUA_PATH
@@ -339,13 +339,13 @@ list(APPEND TEST_ENV
339339
)
340340
if (LUA_HAS_JIT)
341341
generate_ffi_test(luzer_ffi
342-
"${TEST_ENV};FFI_LIB_NAME=testlib.so"
342+
"${TEST_ENV};FFI_LIB_NAME=testlib${CMAKE_SHARED_LIBRARY_SUFFIX}"
343343
"Done 10 runs in 0 second"
344344
)
345345
string(JOIN ";" TEST_ENVIRONMENT
346346
"${TEST_ENV}"
347347
LD_PRELOAD=${ASAN_DSO_PATH}
348-
FFI_LIB_NAME=testlib_asan.so
348+
FFI_LIB_NAME=testlib_asan${CMAKE_SHARED_LIBRARY_SUFFIX}
349349
)
350350
# XXX: Memory leak in FDP is expected, should be fixed in [1].
351351
# 1. https://github.com/ligurio/luzer/issues/52
@@ -356,7 +356,7 @@ if (LUA_HAS_JIT)
356356
string(JOIN ";" TEST_ENVIRONMENT
357357
"${TEST_ENV}"
358358
LD_PRELOAD=${UBSAN_DSO_PATH}
359-
FFI_LIB_NAME=testlib_ubsan.so
359+
FFI_LIB_NAME=testlib_ubsan${CMAKE_SHARED_LIBRARY_SUFFIX}
360360
)
361361
generate_ffi_test(luzer_ffi_ubsan
362362
"${TEST_ENVIRONMENT}"
@@ -365,7 +365,7 @@ if (LUA_HAS_JIT)
365365
string(JOIN ";" TEST_ENVIRONMENT
366366
"${TEST_ENV}"
367367
LD_PRELOAD=${ASAN_DSO_PATH}
368-
FFI_LIB_NAME=testlib_asan.so
368+
FFI_LIB_NAME=testlib_asan${CMAKE_SHARED_LIBRARY_SUFFIX}
369369
ERR_INJECTION=HEAP_BUFFER_OVERFLOW
370370
)
371371
generate_ffi_test(luzer_ffi_asan_heap_overflow
@@ -375,7 +375,7 @@ if (LUA_HAS_JIT)
375375
string(JOIN ";" TEST_ENVIRONMENT
376376
"${TEST_ENV}"
377377
LD_PRELOAD=${UBSAN_DSO_PATH}
378-
FFI_LIB_NAME=testlib_ubsan.so
378+
FFI_LIB_NAME=testlib_ubsan${CMAKE_SHARED_LIBRARY_SUFFIX}
379379
ERR_INJECTION=NULL_POINTER_DEREF
380380
)
381381
generate_ffi_test(luzer_ffi_ubsan_null_pointer_deref

0 commit comments

Comments
 (0)