mirror of
https://github.com/apache/nuttx.git
synced 2025-12-07 10:03:38 +08:00
[CI] testbuild.sh: Msys2 fix toolchain change
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
This commit is contained in:
@@ -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"
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user