From 7f49111b8f24fb154baae0e3f1336803284524fa Mon Sep 17 00:00:00 2001 From: paulbourelly999 <77466294+paulbourelly999@users.noreply.github.com> Date: Wed, 30 Oct 2024 17:41:46 -0400 Subject: [PATCH 1/2] Fix ARM Focal Cross Compilation issues --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 87899af..dd641e5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,6 +20,8 @@ RUN ./opt/carma/scripts/install_build_tools.sh FROM base AS cross-compile-version +RUN ./opt/carma/scripts/install_build_tools.sh + # set an envionrment variable anything can use to tell this is a cross compile environment ARG BUILD_ARCHITECTURE ENV BUILD_ARCHITECTURE=$BUILD_ARCHITECTURE @@ -32,7 +34,7 @@ COPY cross/add_cross_architecture_ports.sh / RUN /add_cross_architecture_ports.sh # install the cross compiler -RUN apt-get update && apt-get install -y cmake crossbuild-essential-${BUILD_ARCHITECTURE} file +RUN apt-get update && apt-get install -y crossbuild-essential-${BUILD_ARCHITECTURE} file # copy in our CMake toolchain file which indicates which compile tools to use COPY cross/cmake_${BUILD_ARCHITECTURE}.toolchain.ubuntu /opt/carma/cmake/ From cead91f94a9a88458ce7547f138bfb6b17669865 Mon Sep 17 00:00:00 2001 From: dev Date: Wed, 30 Oct 2024 17:56:11 -0400 Subject: [PATCH 2/2] Updates --- Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index dd641e5..cb27137 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,15 +12,14 @@ ENV DEBIAN_FRONTEND="noninteractive" # have the package manager scan the current repo list RUN apt-get update -FROM base AS x64-version - # add build tools including Google test and mock RUN ./opt/carma/scripts/install_build_tools.sh +FROM base AS x64-version +# Native build/dev environment FROM base AS cross-compile-version - -RUN ./opt/carma/scripts/install_build_tools.sh +# Cross Compile environment # set an envionrment variable anything can use to tell this is a cross compile environment ARG BUILD_ARCHITECTURE