diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py index 768469f030d663..375921edee45c7 100644 --- a/scripts/build/build/targets.py +++ b/scripts/build/build/targets.py @@ -274,7 +274,6 @@ def HostTargets(): builder.AppendVariant(name="clang", use_clang=True), builder.AppendVariant(name="test", extra_tests=True), - builder.WhitelistVariantNameForGlob('no-interactive-ipv6only') builder.WhitelistVariantNameForGlob('ipv6only') for target in app_targets: @@ -285,12 +284,7 @@ def HostTargets(): builder.targets.append(target) for target in builder.AllVariants(): - if cross_compile and 'chip-tool' in target.name and 'arm64' in target.name and '-no-interactive' not in target.name: - # Interactive builds will not compile by default on arm cross compiles - # because libreadline is not part of the default sysroot - yield target.GlobBlacklist('Arm crosscompile does not support libreadline-dev') - else: - yield target + yield target # Without extra build variants yield target_native.Extend('chip-cert', app=HostApp.CERT_TOOL) diff --git a/scripts/build/testdata/build_linux_on_x64.txt b/scripts/build/testdata/build_linux_on_x64.txt index bc3cb4701e2b73..751ccb65f8195e 100644 --- a/scripts/build/testdata/build_linux_on_x64.txt +++ b/scripts/build/testdata/build_linux_on_x64.txt @@ -11,10 +11,15 @@ bash -c ' PKG_CONFIG_PATH="SYSROOT_AARCH64/lib/aarch64-linux-gnu/pkgconfig" \ gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-app/linux '"'"'--args=chip_inet_config_enable_ipv4=false target_cpu="arm64" is_clang=true chip_crypto="mbedtls" sysroot="SYSROOT_AARCH64"'"'"' {out}/linux-arm64-all-clusters-ipv6only' -# Generating linux-arm64-chip-tool-no-interactive-ipv6only +# Generating linux-arm64-chip-tool bash -c ' PKG_CONFIG_PATH="SYSROOT_AARCH64/lib/aarch64-linux-gnu/pkgconfig" \ - gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/chip-tool '"'"'--args=chip_inet_config_enable_ipv4=false config_use_interactive_mode=false target_cpu="arm64" is_clang=true chip_crypto="mbedtls" sysroot="SYSROOT_AARCH64"'"'"' {out}/linux-arm64-chip-tool-no-interactive-ipv6only' + gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/chip-tool '"'"'--args=target_cpu="arm64" is_clang=true chip_crypto="mbedtls" sysroot="SYSROOT_AARCH64"'"'"' {out}/linux-arm64-chip-tool' + +# Generating linux-arm64-chip-tool-ipv6only +bash -c ' +PKG_CONFIG_PATH="SYSROOT_AARCH64/lib/aarch64-linux-gnu/pkgconfig" \ + gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/chip-tool '"'"'--args=chip_inet_config_enable_ipv4=false target_cpu="arm64" is_clang=true chip_crypto="mbedtls" sysroot="SYSROOT_AARCH64"'"'"' {out}/linux-arm64-chip-tool-ipv6only' # Generating linux-arm64-lock bash -c ' @@ -102,9 +107,6 @@ gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/exa # Generating linux-x64-chip-tool-ipv6only gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/chip-tool --args=chip_inet_config_enable_ipv4=false {out}/linux-x64-chip-tool-ipv6only -# Generating linux-x64-chip-tool-no-interactive-ipv6only -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/chip-tool '--args=chip_inet_config_enable_ipv4=false config_use_interactive_mode=false' {out}/linux-x64-chip-tool-no-interactive-ipv6only - # Generating linux-x64-lock gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/linux {out}/linux-x64-lock @@ -165,8 +167,11 @@ ninja -C {out}/linux-arm64-all-clusters # Building linux-arm64-all-clusters-ipv6only ninja -C {out}/linux-arm64-all-clusters-ipv6only -# Building linux-arm64-chip-tool-no-interactive-ipv6only -ninja -C {out}/linux-arm64-chip-tool-no-interactive-ipv6only +# Building linux-arm64-chip-tool +ninja -C {out}/linux-arm64-chip-tool + +# Building linux-arm64-chip-tool-ipv6only +ninja -C {out}/linux-arm64-chip-tool-ipv6only # Building linux-arm64-lock ninja -C {out}/linux-arm64-lock @@ -228,9 +233,6 @@ ninja -C {out}/linux-x64-chip-tool # Building linux-x64-chip-tool-ipv6only ninja -C {out}/linux-x64-chip-tool-ipv6only -# Building linux-x64-chip-tool-no-interactive-ipv6only -ninja -C {out}/linux-x64-chip-tool-no-interactive-ipv6only - # Building linux-x64-lock ninja -C {out}/linux-x64-lock