Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-12-23 00:54:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #224 from Nadav-Eyesight/linux_arm64

Browse Source 
Fixes to backward compatibility.
This commit is contained in:
Matt McCormick 2018-05-10 19:22:02 -04:00 committed by GitHub
commit 9cc9ae7977
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
linux-arm64/Dockerfile.in
View File

@ -25,13 +25,13 @@ RUN apt-get install -y libglib2.0-dev zlib1g-dev libpixman-1-dev && \
cd .. && rm -rf qemu-2.6.0 cd .. && rm -rf qemu-2.6.0
ENV CROSS_TRIPLE aarch64-unknown-linux-gnueabi ENV CROSS_TRIPLE aarch64-unknown-linux-gnueabi
ENV CROSS_ROOT /opt/x-tools/${CROSS_TRIPLE} ENV CROSS_ROOT /usr/bin/${CROSS_TRIPLE}
ENV AS=/opt/x-tools/${CROSS_TRIPLE}/bin/${CROSS_TRIPLE}-as \ ENV AS=/usr/bin/${CROSS_TRIPLE}/bin/${CROSS_TRIPLE}-as \
AR=/opt/x-tools/${CROSS_TRIPLE}/bin/${CROSS_TRIPLE}-ar \ AR=/usr/bin/${CROSS_TRIPLE}/bin/${CROSS_TRIPLE}-ar \
CC=/opt/x-tools/${CROSS_TRIPLE}/bin/${CROSS_TRIPLE}-gcc \ CC=/usr/bin/${CROSS_TRIPLE}/bin/${CROSS_TRIPLE}-gcc \
CPP=/opt/x-tools/${CROSS_TRIPLE}/bin/${CROSS_TRIPLE}-cpp \ CPP=/usr/bin/${CROSS_TRIPLE}/bin/${CROSS_TRIPLE}-cpp \
CXX=/opt/x-tools/${CROSS_TRIPLE}/bin/${CROSS_TRIPLE}-g++ \ CXX=/usr/bin/${CROSS_TRIPLE}/bin/${CROSS_TRIPLE}-g++ \
LD=/opt/x-tools/${CROSS_TRIPLE}/bin/${CROSS_TRIPLE}-ld LD=/usr/bin/${CROSS_TRIPLE}/bin/${CROSS_TRIPLE}-ld
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-arm64 ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-arm64
WORKDIR /work WORKDIR /work

12
linux-arm64/Toolchain.cmake
View File

@ -5,17 +5,17 @@ set(CMAKE_SYSTEM_PROCESSOR aarch64)
set(cross_triple "aarch64-unknown-linux-gnueabi") set(cross_triple "aarch64-unknown-linux-gnueabi")
set(CMAKE_C_COMPILER /opt/x-tools/aarch64-unknown-linux-gnueabi/bin/${cross_triple}-cc) set(CMAKE_C_COMPILER /usr/bin/aarch64-unknown-linux-gnueabi/bin/${cross_triple}-cc)
set(CMAKE_CXX_COMPILER /opt/x-tools/aarch64-unknown-linux-gnueabi/bin/${cross_triple}-c++) set(CMAKE_CXX_COMPILER /usr/bin/aarch64-unknown-linux-gnueabi/bin/${cross_triple}-c++)
set(CMAKE_Fortran_COMPILER /opt/x-tools/aarch64-unknown-linux-gnueabi/bin/${cross_triple}-gfortran) set(CMAKE_Fortran_COMPILER /usr/bin/aarch64-unknown-linux-gnueabi/bin/${cross_triple}-gfortran)
set(CMAKE_FIND_ROOT_PATH /opt/x-tools/aarch64-unknown-linux-gnueabi) set(CMAKE_FIND_ROOT_PATH /usr/bin/aarch64-unknown-linux-gnueabi)
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
set(CMAKE_SYSROOT /opt/x-tools/aarch64-unknown-linux-gnueabi/aarch64-unknown-linux-gnueabi/sysroot) set(CMAKE_SYSROOT /usr/bin/aarch64-unknown-linux-gnueabi/aarch64-unknown-linux-gnueabi/sysroot)
set(CMAKE_CXX_FLAGS "-I /opt/x-tools/aarch64-unknown-linux-gnueabi/include") set(CMAKE_CXX_FLAGS "-I /usr/bin/aarch64-unknown-linux-gnueabi/include")
set(ADDITIONAL_COMPILER_FLAGS "-L /usr/lib/aarch64-linux-gnu -Wl,-rpath-link,/usr/lib/aarch64-linux-gnu -Wl,-rpath-link,/lib/aarch64-linux-gnu") set(ADDITIONAL_COMPILER_FLAGS "-L /usr/lib/aarch64-linux-gnu -Wl,-rpath-link,/usr/lib/aarch64-linux-gnu -Wl,-rpath-link,/lib/aarch64-linux-gnu")
set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-aarch64) set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-aarch64)

4
linux-arm64/crosstool-ng.config
View File

@ -32,7 +32,7 @@ CT_LOCAL_TARBALLS_DIR="${HOME}/src"
CT_SAVE_TARBALLS=y CT_SAVE_TARBALLS=y
CT_WORK_DIR="${CT_TOP_DIR}/.build" CT_WORK_DIR="${CT_TOP_DIR}/.build"
CT_BUILD_TOP_DIR="${CT_WORK_DIR}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TARGET}" CT_BUILD_TOP_DIR="${CT_WORK_DIR}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TARGET}"
CT_PREFIX_DIR="/opt/x-tools/${CT_TARGET}" CT_PREFIX_DIR="/usr/bin/${CT_TARGET}"
CT_RM_RF_PREFIX_DIR=y CT_RM_RF_PREFIX_DIR=y
CT_REMOVE_DOCS=y CT_REMOVE_DOCS=y
CT_PREFIX_DIR_RO=y CT_PREFIX_DIR_RO=y
@ -417,7 +417,7 @@ CT_CC_SUPPORT_GOLANG=y
# Additional supported languages: # Additional supported languages:
# #
CT_CC_LANG_CXX=y CT_CC_LANG_CXX=y
# CT_CC_LANG_FORTRAN is not set CT_CC_LANG_FORTRAN=y
# CT_CC_LANG_JAVA is not set # CT_CC_LANG_JAVA is not set
# #