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 @@ -1132,13 +1132,26 @@ build_single_target() {
11321132 # https://packages.debian.org/testing/all/libstdc++-13-dev-arm64-cross/filelist
11331133 # /usr/aarch64-linux-gnu/include/c++/13/
11341134 tmp=" $( find " /usr/${_TRIPLETSH} /include/c++" -mindepth 1 -maxdepth 1 -type d | head -n 1 || true) "
1135- if [ -z " ${tmp} " ]; then
1136- >&2 echo ' ! Error: Failed to detect g++-cross env root.'
1137- exit 1
1135+ if [ -n " ${tmp} " ]; then
1136+ _CXXFLAGS_GLOBAL+=" -I${tmp} "
1137+ _CXXFLAGS_GLOBAL+=" -I${tmp} /${_TRIPLETSH} "
1138+ _CXXFLAGS_GLOBAL+=" -I${tmp} /backward"
1139+ else
1140+ # https://packages.debian.org/trixie/arm64/libstdc++-12-dev/filelist
1141+ # /usr/include/c++/12/algorithm
1142+ # /usr/include/aarch64-linux-gnu/c++/12/ext/opt_random.h
1143+ tmp1=" $( find " /usr/include/c++" -mindepth 1 -maxdepth 1 -type d | head -n 1 || true) "
1144+ tmp2=" $( find " /usr/include/${_TRIPLETSH} /c++" -mindepth 1 -maxdepth 1 -type d | head -n 1 || true) "
1145+ if [ -n " ${tmp1} " ] && \
1146+ [ -n " ${tmp2} " ]; then
1147+ _CXXFLAGS_GLOBAL+=" -I${tmp1} "
1148+ _CXXFLAGS_GLOBAL+=" -I${tmp2} "
1149+ _CXXFLAGS_GLOBAL+=" -I${tmp1} /backward"
1150+ else
1151+ >&2 echo ' ! Error: Failed to detect g++-cross env root.'
1152+ exit 1
1153+ fi
11381154 fi
1139- _CXXFLAGS_GLOBAL+=" -I${tmp} "
1140- _CXXFLAGS_GLOBAL+=" -I${tmp} /${_TRIPLETSH} "
1141- _CXXFLAGS_GLOBAL+=" -I${tmp} /backward"
11421155 fi
11431156 fi
11441157
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