Skip to content

Commit

Permalink
[CI] testbuild.sh: Msys2 fix toolchain change
Browse files Browse the repository at this point in the history
In the Msys2 (Windows) environment, this search filter is not sufficient.

$ grep _TOOLCHAIN_ .config | grep -v CONFIG_ARCH_TOOLCHAIN_* | grep =y
CONFIG_TOOLCHAIN_WINDOWS=y
CONFIG_ARM_TOOLCHAIN_GNU_EABI=y

It is necessary to add
$ grep _TOOLCHAIN_ .config |  grep -v CONFIG_TOOLCHAIN_WINDOWS | grep -v CONFIG_ARCH_TOOLCHAIN_* | grep =y
CONFIG_ARM_TOOLCHAIN_GNU_EABI=y
  • Loading branch information
simbit18 authored and xiaoxiang781216 committed Jan 17, 2025
1 parent 1b36954 commit 1bfd1d7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tools/testbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ function configure_default {
fi

if [ "X$toolchain" != "X" ]; then
setting=`grep _TOOLCHAIN_ $nuttx/.config | grep -v CONFIG_ARCH_TOOLCHAIN_* | grep =y`
setting=`grep _TOOLCHAIN_ $nuttx/.config | grep -v CONFIG_TOOLCHAIN_WINDOWS | grep -v CONFIG_ARCH_TOOLCHAIN_* | grep =y`
original_toolchain=`echo $setting | cut -d'=' -f1`
if [ ! -z "$original_toolchain" ]; then
echo " Disabling $original_toolchain"
Expand All @@ -347,7 +347,7 @@ function configure_cmake {
fi

if [ "X$toolchain" != "X" ]; then
setting=`grep _TOOLCHAIN_ $nuttx/build/.config | grep -v CONFIG_ARCH_TOOLCHAIN_* | grep =y`
setting=`grep _TOOLCHAIN_ $nuttx/build/.config | grep -v CONFIG_TOOLCHAIN_WINDOWS | grep -v CONFIG_ARCH_TOOLCHAIN_* | grep =y`
original_toolchain=`echo $setting | cut -d'=' -f1`
if [ ! -z "$original_toolchain" ]; then
echo " Disabling $original_toolchain"
Expand Down

0 comments on commit 1bfd1d7

Please sign in to comment.