[Mesa-dev] [PATCH 3/6] mesa/Makefile: Fix a race in the build.

Stéphane Marchesin marcheu at chromium.org
Thu May 24 18:29:45 PDT 2012


From: Mike Frysinger <vapier at chromium.org>

The intent of the message above it is right (we need to build those
dependencies in that order) but the implementation is wrong, as it
can be executed in any order. To enforce the order, invoke make
multiple times.
---
 src/mesa/Makefile |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 71e22b9..ce38081 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -65,7 +65,10 @@ $(DRICORE_OBJ_DIR)/%.o: %.S
 
 # Default: build dependencies, then asm_subdirs, GLSL built-in lib,
 # then convenience libs (.a) and finally the device drivers:
-default: $(DEPENDS) asm_subdirs $(MESA_LIBS) $(DRICORE_LIBS) driver_subdirs
+default: $(DEPENDS)
+	$(MAKE) asm_subdirs
+	$(MAKE) $(MESA_LIBS) $(DRICORE_LIBS)
+	$(MAKE) driver_subdirs
 
 # include glapi_gen.mk for generating glapi headers for GLES
 GLAPI := $(TOP)/src/mapi/glapi/gen
-- 
1.7.5.3.367.ga9930



More information about the mesa-dev mailing list