From 15d2f12fa169fc0b7a5a6cd1dcae552a9a6b8a4f Mon Sep 17 00:00:00 2001 From: Alex Mikhalevich <2990126+alexmikhalevich@users.noreply.github.com> Date: Wed, 27 Mar 2024 10:26:43 +0100 Subject: [PATCH] fixup! fix read inspect in libcmt --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7e7d181f..5ea1d628 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,6 +38,7 @@ apt-get install -y --no-install-recommends \ wget \ pkg-config \ dpkg-cross \ + libclang-dev \ gcc-12-riscv64-linux-gnu \ g++-12-riscv64-linux-gnu @@ -46,6 +47,8 @@ for tool in cpp g++ gcc gcc-ar gcc-nm gcc-ranlib gcov gcov-dump gcov-tool; do update-alternatives --install /usr/bin/$tool $tool /usr/bin/$tool-12 12 done +ln -s gcc /usr/bin/cc + wget -O ${LINUX_HEADERS_FILEPATH} ${LINUX_HEADERS_URLPATH} echo "7d0238324661a3850fe2e07e5c4485a94da5d5162dbb67def0f1541ed1dc3b45 ${LINUX_HEADERS_FILEPATH}" | sha256sum --check apt-get install -y --no-install-recommends ${LINUX_HEADERS_FILEPATH} @@ -76,7 +79,7 @@ RUN make -C ${BUILD_BASE}/tools/sys-utils/libcmt/ -j$(nproc) install install-moc PREFIX=/usr/x86_64-linux-gnu TARGET_PREFIX=/usr/riscv64-linux-gnu USER developer RUN make -C ${BUILD_BASE}/tools/sys-utils/ -j$(nproc) all -ENV CPATH="${CMT_BASE}/install/include:${CPATH}" +ENV CPATH="/usr/riscv64-linux-gnu/include/:${CPATH}" # build rust tools # ------------------------------------------------------------------------------ @@ -138,7 +141,6 @@ ARG STAGING_BASE=${BUILD_BASE}/_install ARG STAGING_DEBIAN=${STAGING_BASE}/DEBIAN ARG STAGING_SBIN=${STAGING_BASE}/usr/sbin ARG STAGING_BIN=${STAGING_BASE}/usr/bin -ARG CMT_TAR_GZ=libcmt-v0.15.0.tar.gz RUN mkdir -p ${STAGING_DEBIAN} ${STAGING_SBIN} ${STAGING_BIN} ${STAGING_BASE}/etc && \ echo "cartesi-machine" > ${staging_base}/etc/hostname