From 39a31c83b1a1457815678c21d29c8e0d31d69691 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Sun, 27 Jun 2021 14:52:44 +0200 Subject: [PATCH] Fix error on manylinux2014-aarch64 Fix error on manylinux2014-aarch64 Signed-off-by: Bensuperpc --- imagefiles/install-crosstool-ng-toolchain.sh | 3 +++ manylinux2014-aarch64/Dockerfile.in | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/imagefiles/install-crosstool-ng-toolchain.sh b/imagefiles/install-crosstool-ng-toolchain.sh index 384b13b..f343882 100755 --- a/imagefiles/install-crosstool-ng-toolchain.sh +++ b/imagefiles/install-crosstool-ng-toolchain.sh @@ -111,6 +111,9 @@ cp "${CONFIG_PATH}" "${BUILD}/.config" # As mentioned in ct-ng config, need to unset LD_LIBRARY_PATH. unset LD_LIBRARY_PATH +# Fix build error on manylinux2014-aarch64 +unset CC +unset CXX # Build and install the toolchain! # Print last 250 lines if build fail diff --git a/manylinux2014-aarch64/Dockerfile.in b/manylinux2014-aarch64/Dockerfile.in index a404817..32c9e60 100644 --- a/manylinux2014-aarch64/Dockerfile.in +++ b/manylinux2014-aarch64/Dockerfile.in @@ -6,6 +6,10 @@ FROM dockcross/manylinux2014-x64 # This is for 64-bit ARM Manylinux machine +# Crosstool-ng version +# Issues with crosstool-ng-1.24.0 and up : https://github.com/dockcross/dockcross/issues/367 +ENV CT_VERSION crosstool-ng-1.23.0 + #include "common-manylinux.crosstool" # The cross-compiling emulator