File tree 2 files changed +19
-5
lines changed
2 files changed +19
-5
lines changed Original file line number Diff line number Diff line change @@ -572,11 +572,17 @@ build_single_target() {
572
572
# Include CRT type in Linux triplets, to make it visible in
573
573
# the curl version banner.
574
574
_TRIPLET=" ${_machine} -pc-linux-${_CRT} "
575
+ # Short triplet used on the Linux filesystem
576
+ _TRIPLETSH=" ${_machine} -linux-gnu"
575
577
576
578
if [ " ${unamem} " != " ${_machine} " ] && [ " ${_CC} " = ' gcc' ]; then
577
- # TODO: Implement cross-builds with gcc
578
- echo " ! WARNING: Linux cross-buils require llvm/clang. Skipping."
579
- return
579
+ # https://packages.debian.org/testing/arm64/gcc-x86-64-linux-gnu/filelist
580
+ # https://packages.debian.org/testing/arm64/binutils-x86-64-linux-gnu/filelist
581
+ # /usr/bin/x86_64-linux-gnu-gcc
582
+ # https://packages.debian.org/testing/amd64/gcc-aarch64-linux-gnu/filelist
583
+ # https://packages.debian.org/testing/amd64/binutils-aarch64-linux-gnu/filelist
584
+ # /usr/bin/aarch64-linux-gnu-gcc
585
+ _CCPREFIX=" ${_TRIPLETSH} -"
580
586
fi
581
587
582
588
_RUN_BIN=' echo'
Original file line number Diff line number Diff line change @@ -18,9 +18,17 @@ extra=''
18
18
if [[ " ${CW_CONFIG:- } " = * ' linux' * ]]; then
19
19
extra=" ${extra} checksec"
20
20
if [ " $( uname -m) " = ' aarch64' ]; then
21
- extra=" ${extra} libgcc-13-dev-amd64-cross libstdc++-13-dev-amd64-cross"
21
+ if [[ " ${CW_CONFIG:- } " = * ' gcc' * ]]; then
22
+ extra=" ${extra} gcc${CW_CCSUFFIX} -x86-64-linux-gnu"
23
+ else
24
+ extra=" ${extra} libgcc-13-dev-amd64-cross libstdc++-13-dev-amd64-cross"
25
+ fi
22
26
else
23
- extra=" ${extra} libgcc-13-dev-arm64-cross libstdc++-13-dev-arm64-cross"
27
+ if [[ " ${CW_CONFIG:- } " = * ' gcc' * ]]; then
28
+ extra=" ${extra} gcc${CW_CCSUFFIX} -aarch64-linux-gnu"
29
+ else
30
+ extra=" ${extra} libgcc-13-dev-arm64-cross libstdc++-13-dev-arm64-cross"
31
+ fi
24
32
fi
25
33
fi
26
34
You can’t perform that action at this time.
0 commit comments