From 1e3708a912686557e38a4d023a76ce3f551531c1 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Wed, 21 Feb 2024 17:51:37 -0600 Subject: [PATCH] Change file list collection for build. Oliver Webb noticed that selecting allnoconfig then enabling just sh (instead of "make sh" singleconfig) build breaks because test.c isn't build but it tries to pull in test_main(). So search for files to compile using unintented USE() macros wrapping NEW() --- scripts/make.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/make.sh b/scripts/make.sh index 3a5d0826..21b9d7cb 100755 --- a/scripts/make.sh +++ b/scripts/make.sh @@ -90,8 +90,8 @@ mkdir -p "$UNSTRIPPED" "$(dirname $OUTNAME)" || exit 1 # (First command names, then filenames with relevant {NEW,OLD}TOY() macro.) [ -n "$V" ] && echo -e "\nWhich C files to build..." -TOYFILES="$($SED -n 's/^CONFIG_\([^=]*\)=.*/\1/p' "$KCONFIG_CONFIG" | xargs | tr ' [A-Z]' '|[a-z]')" -TOYFILES="main.c $(egrep -l "TOY[(]($TOYFILES)[ ,]" toys/*/*.c | xargs)" +TOYFILES="$($SED -n 's/^CONFIG_\([^=]*\)=.*/\1/p' "$KCONFIG_CONFIG" | xargs | tr ' ' '|')" +TOYFILES="main.c $(egrep -l "^USE_($TOYFILES)[(]...TOY[(]" toys/*/*.c | xargs)" if [ "${TOYFILES/pending//}" != "$TOYFILES" ] then -- 2.39.2