Merge pull request iovisor#1726 from iovisor/yhs_dev

fix lua compilation issue with latest clang/llvm 7.0
drcwr · May 2, 2018 · 319487f · 319487f
2 parents aa1201a + eb88b35
commit 319487f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/cc/CMakeLists.txt b/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)
-add_library(bcc-lua-static STATIC
+set(bcc-lua-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 b_frontend clang_frontend bpf-static
+set(bcc_common_libs_for_s ${bcc_common_libs_for_a})
+set(bcc_common_libs_for_lua 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)
-target_link_libraries(bcc-lua-static ${bcc_common_libs_for_lua})
+set(bcc-lua-static ${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)

diff --git a/src/lua/CMakeLists.txt b/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 -Wl,--whole-archive bcc-lua-static -Wl,--no-whole-archive)
+ target_link_libraries(bcc-lua ${bcc-lua-static})
  if (NOT COMPILER_NOPIE_FLAG EQUAL "")
  target_link_libraries(bcc-lua ${COMPILER_NOPIE_FLAG})
  endif()