depend-cleanup.sh: handle 32-bit dependencies having no 64-bit equivalent

For example with the recent removal of ffs.S for 32-bit arm and i386,
the egrep in clean_dep() did not find any files to remove, even if you
added a "clean_dep lib/libc ffs S" line. This is because it will never
find the ffs.S filename in the 64-bit .depend files for libc.

Split the searching and removing of 32-bit dependencies and objects into
a separate part to cope with this. This can be used similarly later on,
for other bitnesses.

MFC after:	3 days

This commit is contained in:

Dimitry Andric

2023-07-11 00:50:09 +02:00

parent dba2e89ea7

commit 7ba8cc9b7b

1 changed files with 5 additions and 1 deletions

									
										tools/build/depend-cleanup.sh
									
		+5
		-1
	
												View File
												
				@@ -32,7 +32,11 @@ clean_dep()

						echo "Removing stale dependencies and objects for $2.$3"

						rm -f \

						    "$OBJTOP"/$1/.depend.$2.* \

						    "$OBJTOP"/$1/$2.*o \

						    "$OBJTOP"/$1/$2.*o

					fi

					if egrep -qw "$2\.$3" "$OBJTOP"/obj-lib32/$1/.depend.$2.*o 2>/dev/null; then

						echo "Removing 32-bit stale dependencies and objects for $2.$3"

						rm -f \

						    "$OBJTOP"/obj-lib32/$1/.depend.$2.* \

						    "$OBJTOP"/obj-lib32/$1/$2.*o

					fi