mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-08-03 07:55:17 +00:00
44 lines
2.0 KiB
Diff
44 lines
2.0 KiB
Diff
--- src/cc/CMakeLists.txt
|
|
+++ src/cc/CMakeLists.txt
|
|
@@ -52,7 +52,7 @@ target_link_libraries(bcc-loader-static elf)
|
|
add_library(bcc-static STATIC
|
|
${bcc_common_sources} ${bcc_table_sources} ${bcc_util_sources})
|
|
set_target_properties(bcc-static PROPERTIES OUTPUT_NAME bcc)
|
|
-set(bcc-lua-static
|
|
+add_library(bcc-lua-static STATIC
|
|
${bcc_common_sources} ${bcc_table_sources} ${bcc_sym_sources} ${bcc_util_sources})
|
|
|
|
include(clang_libs)
|
|
@@ -64,9 +64,9 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${llvm_lib_exclude_f
|
|
set(bcc_common_libs_for_a b_frontend clang_frontend bpf-static
|
|
-Wl,--whole-archive ${clang_libs} ${llvm_libs} -Wl,--no-whole-archive
|
|
${LIBELF_LIBRARIES})
|
|
-set(bcc_common_libs_for_s ${bcc_common_libs_for_a})
|
|
-set(bcc_common_libs_for_lua b_frontend clang_frontend bpf-static
|
|
+set(bcc_common_libs_for_s b_frontend clang_frontend bpf-static
|
|
${clang_libs} ${llvm_libs} ${LIBELF_LIBRARIES})
|
|
+set(bcc_common_libs_for_lua ${bcc_common_libs_for_s})
|
|
|
|
if(ENABLE_CPP_API)
|
|
add_subdirectory(api)
|
|
@@ -87,7 +87,7 @@ add_subdirectory(frontends)
|
|
# Link against LLVM libraries
|
|
target_link_libraries(bcc-shared ${bcc_common_libs_for_s})
|
|
target_link_libraries(bcc-static ${bcc_common_libs_for_a} bcc-loader-static)
|
|
-set(bcc-lua-static ${bcc-lua-static} ${bcc_common_libs_for_lua})
|
|
+target_link_libraries(bcc-lua-static ${bcc_common_libs_for_lua})
|
|
|
|
install(TARGETS bcc-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
install(FILES ${bcc_table_headers} DESTINATION include/bcc)
|
|
--- src/lua/CMakeLists.txt
|
|
+++ src/lua/CMakeLists.txt
|
|
@@ -23,7 +23,7 @@ if (LUAJIT_LIBRARIES AND LUAJIT)
|
|
add_executable(bcc-lua src/main.c bcc.o)
|
|
set_target_properties(bcc-lua PROPERTIES LINKER_LANGUAGE C)
|
|
target_link_libraries(bcc-lua ${LUAJIT_LIBRARIES})
|
|
- target_link_libraries(bcc-lua ${bcc-lua-static})
|
|
+ target_link_libraries(bcc-lua -Wl,--whole-archive bcc-lua-static -Wl,--no-whole-archive)
|
|
if (NOT COMPILER_NOPIE_FLAG EQUAL "")
|
|
target_link_libraries(bcc-lua ${COMPILER_NOPIE_FLAG})
|
|
endif()
|