Commit ec7ba198 authored by Alastair Robertson's avatar Alastair Robertson

Fix build

Base docker image updated and caused linker issues. This is a horrible
fix and is hopefully only temporary until I get a better solution
working.
parent 36cdb6d6
......@@ -25,7 +25,7 @@ ExternalProject_Add(bcc
STEP_TARGETS build update
EXCLUDE_FROM_ALL 1
UPDATE_DISCONNECTED 1
BUILD_COMMAND ${CMAKE_COMMAND} --build . --target bcc-static
BUILD_COMMAND ${CMAKE_COMMAND} --build . --target bcc-loader-static
)
add_subdirectory(src)
......
FROM ubuntu:rolling
FROM ubuntu:yakkety
RUN apt-get update && apt-get install -y \
bison \
cmake \
......
......@@ -31,5 +31,5 @@ target_link_libraries(bpftrace ${llvm_libs})
add_dependencies(bpftrace bcc-build)
ExternalProject_Get_Property(bcc source_dir binary_dir)
include_directories(${source_dir}/src/cc)
target_link_libraries(bpftrace ${binary_dir}/src/cc/libbcc.a)
target_link_libraries(bpftrace ${binary_dir}/src/cc/libbcc-loader-static.a)
target_link_libraries(bpftrace ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../../../usr/lib/x86_64-linux-gnu/libelf.a)
......@@ -19,8 +19,9 @@ add_executable(bpftrace_test
add_dependencies(bpftrace_test bcc-build)
ExternalProject_Get_Property(bcc source_dir binary_dir)
include_directories(${source_dir}/src/cc)
target_link_libraries(bpftrace_test ${binary_dir}/src/cc/libbcc.a)
target_link_libraries(bpftrace_test ${binary_dir}/src/cc/libbcc-loader-static.a)
target_link_libraries(bpftrace_test /usr/lib/x86_64-linux-gnu/libelf.a)
target_link_libraries(bpftrace_test /usr/lib/x86_64-linux-gnu/libz.a)
find_package(Threads REQUIRED)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment