diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index d2667395a..e95215e5a 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -128,7 +128,6 @@ if(WITH_FPGA) list(APPEND LIBRARIES villas-fpga) endif() -link_directories(/app/lib/aarch64-linux-gnu /usr/lib/aarch64-linux-gnu) add_library(villas SHARED ${LIB_SRC}) target_include_directories(villas PUBLIC ${INCLUDE_DIRS}) target_link_libraries(villas PUBLIC ${LIBRARIES}) diff --git a/packaging/docker/Dockerfile.debian-multiarch b/packaging/docker/Dockerfile.debian-multiarch index 74dba92f6..e75a2390f 100644 --- a/packaging/docker/Dockerfile.debian-multiarch +++ b/packaging/docker/Dockerfile.debian-multiarch @@ -20,8 +20,6 @@ ARG PREFIX ENV DEBIAN_FRONTEND=noninteractive -ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/app/lib/aarch64-linux-gnu - # Enable ${ARCH} architecture RUN dpkg --add-architecture ${ARCH} @@ -119,7 +117,9 @@ COPY . /villas/ RUN rm -rf /villas/build && mkdir /villas/build WORKDIR /villas/build -RUN cmake ${CMAKE_OPTS} ${CMAKE_EXTRA_OPTS} .. && \ +RUN echo "Debug: build started" + +RUN cmake -DCMAKE_INSTALL_RPATH=/app/lib/aarch64-linux-gnu ${CMAKE_OPTS} ${CMAKE_EXTRA_OPTS} .. && \ make -j$(nproc) install RUN echo "Debug: build finished"