File tree Expand file tree Collapse file tree 2 files changed +26
-6
lines changed
Expand file tree Collapse file tree 2 files changed +26
-6
lines changed Original file line number Diff line number Diff line change @@ -1127,13 +1127,26 @@ build_single_target() {
11271127 # https://packages.debian.org/testing/all/libstdc++-13-dev-arm64-cross/filelist
11281128 # /usr/aarch64-linux-gnu/include/c++/13/
11291129 tmp=" $( find " /usr/${_TRIPLETSH} /include/c++" -mindepth 1 -maxdepth 1 -type d | head -n 1 || true) "
1130- if [ -z " ${tmp} " ]; then
1131- >&2 echo ' ! Error: Failed to detect g++-cross env root.'
1132- exit 1
1130+ if [ -n " ${tmp} " ]; then
1131+ _CXXFLAGS_GLOBAL+=" -I${tmp} "
1132+ _CXXFLAGS_GLOBAL+=" -I${tmp} /${_TRIPLETSH} "
1133+ _CXXFLAGS_GLOBAL+=" -I${tmp} /backward"
1134+ else
1135+ # https://packages.debian.org/trixie/arm64/libstdc++-12-dev/filelist
1136+ # /usr/include/c++/12/algorithm
1137+ # /usr/include/aarch64-linux-gnu/c++/12/ext/opt_random.h
1138+ tmp1=" $( find " /usr/include/c++" -mindepth 1 -maxdepth 1 -type d | head -n 1 || true) "
1139+ tmp2=" $( find " /usr/include/${_TRIPLETSH} /c++" -mindepth 1 -maxdepth 1 -type d | head -n 1 || true) "
1140+ if [ -n " ${tmp1} " ] && \
1141+ [ -n " ${tmp2} " ]; then
1142+ _CXXFLAGS_GLOBAL+=" -I${tmp1} "
1143+ _CXXFLAGS_GLOBAL+=" -I${tmp2} "
1144+ _CXXFLAGS_GLOBAL+=" -I${tmp1} /backward"
1145+ else
1146+ >&2 echo ' ! Error: Failed to detect g++-cross env root.'
1147+ exit 1
1148+ fi
11331149 fi
1134- _CXXFLAGS_GLOBAL+=" -I${tmp} "
1135- _CXXFLAGS_GLOBAL+=" -I${tmp} /${_TRIPLETSH} "
1136- _CXXFLAGS_GLOBAL+=" -I${tmp} /backward"
11371150 fi
11381151 fi
11391152
Original file line number Diff line number Diff line change @@ -100,6 +100,13 @@ elif [[ "${CW_CONFIG:-}" = *'linux'* ]]; then
100100 extra+=" libc6-dev-arm64-cross"
101101 fi
102102 [[ " ${CW_CONFIG:- } " = * ' r64' * ]] && extra+=" libc6-dev-riscv64-cross"
103+
104+ if [ " $( uname -m) " = ' aarch64' ]; then
105+ extra+=" libc6-dev-amd64-cross libstdc++${CW_GCCSUFFIX} -dev-amd64-cross"
106+ else
107+ extra+=" libc6-dev-arm64-cross libstdc++${CW_GCCSUFFIX} -dev-arm64-cross"
108+ fi
109+ [[ " ${CW_CONFIG:- } " = * ' r64' * ]] && extra+=" libc6-dev-riscv64-cross libstdc++${CW_GCCSUFFIX} -dev-riscv64-cross"
103110 fi
104111 if [[ " ${CW_CONFIG:- } " = * ' boringssl' * ]] || [[ " ${CW_CONFIG:- } " = * ' awslc' * ]]; then
105112 if [ " $( uname -m) " = ' aarch64' ]; then
You can’t perform that action at this time.
0 commit comments