Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-06-22 10:53:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Bensuperpc
2021-05-14 08:19:31 +02:00
parent 52a958d7a4
commit ef6ea08a78
10 changed files with 89 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
linux-s390x/Dockerfile.in
View File

@ -11,8 +11,8 @@ RUN apt-get update \
qemu-user-static \
&& apt-get clean --yes
# The CROSS_TRIPLE is a configured alias of the "s390x-unknown-linux-gnu" target.
ENV CROSS_TRIPLE s390x-unknown-linux-gnu
# The CROSS_TRIPLE is a configured alias of the "s390x-ibm-linux-gnu" target.
ENV CROSS_TRIPLE s390x-ibm-linux-gnu
ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
@ -29,6 +29,8 @@ ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}"
COPY Toolchain.cmake ${CROSS_ROOT}/
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
ENV PKG_CONFIG_PATH /usr/lib/s390x-ibm-linux-gnu/pkgconfig
# Linux kernel cross compilation variables
ENV PATH ${PATH}:${CROSS_ROOT}/bin
ENV CROSS_COMPILE ${CROSS_TRIPLE}-

2
linux-s390x/Toolchain.cmake
View File

@ -2,7 +2,7 @@ set(CMAKE_SYSTEM_NAME Linux)
set(CMAKE_SYSTEM_VERSION 1)
set(CMAKE_SYSTEM_PROCESSOR s390x)
set(cross_triple "s390x-unknown-linux-gnu")
set(cross_triple "s390x-ibm-linux-gnu")
set(cross_root /usr/xcc/${cross_triple})
set(CMAKE_C_COMPILER $ENV{CC})