Skip to content

Commit 01e9fe2

Browse files
committed
wip: aarch64 toolchain
1 parent 7123ae0 commit 01e9fe2

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

.docker/build-linux.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,8 +327,8 @@ if [[ "-$BUILD_TYPE-" == *-static-* ]]; then
327327
fi
328328

329329
export LDFLAGS="${LDFLAGS} --sysroot=$_SYSROOT -static-libgcc -L$_staticprefix/lib -L$_SYSROOT/usr/$_TARGET/lib -lucontext"
330-
export CFLAGS="${CFLAGS} --sysroot=$_SYSROOT"
331-
export CXXFLAGS="${CXXFLAGS} --sysroot=$_SYSROOT"
330+
export CFLAGS="${CFLAGS} --sysroot=$_SYSROOT -isystem $_staticprefix/include"
331+
export CXXFLAGS="${CXXFLAGS} --sysroot=$_SYSROOT -isystem $_staticprefix/include"
332332
# if [[ "$ARCH" == "aarch64" ]]; then
333333
# # For some reason, this dependency of libunwind is not resolved on aarch64
334334
# export LDFLAGS="${LDFLAGS} -lz"

.docker/install-toolchain.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,8 @@ for target_arch in ${TARGET_ARCH_STR//,/ }; do
129129
cd binutils-${BINUTILS_VERSION}-build-${TARGETARCH}-O${OPT}
130130

131131
"$HOME"/pkgs/binutils-${BINUTILS_VERSION}/configure \
132-
--target=$TARGET --prefix=$PREFIX --with-sysroot=$SYSROOT --disable-nls --disable-werror
132+
--target=$TARGET --program-prefix="$TARGET-" --prefix=$PREFIX --with-sysroot=$SYSROOT \
133+
--disable-nls --disable-werror
133134
make -j"$(nproc)"
134135
make install
135136

0 commit comments

Comments
 (0)