Don't make libmesa.a or libglapi.a depend on asm_subdirs

Since the asm_subdirs target does not actually create a file, make will
always consider that it needs to be rebuilt. If libmesa.a and libglapi.a
have asm_subdirs as a prerequisite, then they will always need to be
rebuilt, too. The correct order will be preserved by the default target,
though.

This should fix #16358.

Conflicts:

	src/mesa/Makefile

cherry-picked from master

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 4e0cea240af817df9f1859ae4f01292fb0bbb643..cf75baa706d6c0bb490865ebda96038d911426f5 100644 (file)
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -32,11 +32,11 @@ default: depend asm_subdirs libmesa.a $(GLAPI_LIB) driver_subdirs
 # Helper libraries used by many drivers:
 
 # Make archive of core mesa object files
-libmesa.a: $(MESA_OBJECTS) asm_subdirs
+libmesa.a: $(MESA_OBJECTS)
        @ $(TOP)/bin/mklib -o mesa -static $(MESA_OBJECTS)
 
 # Make archive of gl* API dispatcher functions only
-$(GLAPI_LIB): $(GLAPI_OBJECTS) asm_subdirs
+$(GLAPI_LIB): $(GLAPI_OBJECTS)
        @if [ "${WINDOW_SYSTEM}" = "dri" ] ; then \
                touch libglapi.a ; \
        else \