diff --git a/linux-armv7/Dockerfile b/linux-armv7/Dockerfile index 2d289f1..4bb8456 100644 --- a/linux-armv7/Dockerfile +++ b/linux-armv7/Dockerfile @@ -12,9 +12,12 @@ RUN apt-get update && apt-get install -y \ qemu-user \ qemu-user-static +ENV CROSS_TRIPLE arm-linux-gnueabihf +ENV CROSS_ROOT /usr/${CROSS_TRIPLE} + WORKDIR /usr/src # Note: Toolchain file support is currently in debian Experimental: # https://wiki.debian.org/CrossToolchains#In_jessie_.28Debian_8.29 -COPY Toolchain.cmake /usr/lib/arm-linux-gnueabihf/ -ENV CMAKE_TOOLCHAIN_FILE /usr/lib/arm-linux-gnueabihf/Toolchain.cmake +COPY Toolchain.cmake /usr/lib/${CROSS_TRIPLE}/ +ENV CMAKE_TOOLCHAIN_FILE /usr/lib/${CROSS_TRIPLE}/Toolchain.cmake diff --git a/linux-ppc64le/Dockerfile b/linux-ppc64le/Dockerfile index 171a144..3aec405 100644 --- a/linux-ppc64le/Dockerfile +++ b/linux-ppc64le/Dockerfile @@ -10,6 +10,9 @@ RUN apt-get update && apt-get install -y \ crossbuild-essential-ppc64el \ gfortran-powerpc64le-linux-gnu +ENV CROSS_TRIPLE powerpc64le-linux-gnu +ENV CROSS_ROOT /usr/${CROSS_TRIPLE} + WORKDIR /usr/src RUN apt-get update && \ @@ -24,5 +27,5 @@ RUN apt-get update && \ # Note: Toolchain file support is currently in debian Experimental according to: # https://wiki.debian.org/CrossToolchains#In_jessie_.28Debian_8.29 # We can switch to that when it becomes stable. -COPY Toolchain.cmake /usr/lib/powerpc64le-linux-gnu/ -ENV CMAKE_TOOLCHAIN_FILE /usr/lib/powerpc64le-linux-gnu/Toolchain.cmake +COPY Toolchain.cmake /usr/lib/${CROSS_TRIPLE}/ +ENV CMAKE_TOOLCHAIN_FILE /usr/lib/${CROSS_TRIPLE}/Toolchain.cmake