Mesa (master): gallium/drm: Handle circular dependencies in the auxiliary libraries with make.

[Michel Dänzer]

Module: Mesa
Branch: master
Commit: 7c08614b325a409890b44c9b6375cda26d09867d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7c08614b325a409890b44c9b6375cda26d09867d

Author: Michel Dänzer <daenzer at vmware.com>
Date:   Thu Aug 13 18:46:53 2009 +0200

gallium/drm: Handle circular dependencies in the auxiliary libraries with make.

---

 src/gallium/winsys/drm/Makefile.template |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/gallium/winsys/drm/Makefile.template b/src/gallium/winsys/drm/Makefile.template
index 985e5a8..9635c3c 100644
--- a/src/gallium/winsys/drm/Makefile.template
+++ b/src/gallium/winsys/drm/Makefile.template
@@ -83,7 +83,9 @@ default: depend symlinks $(TOP)/$(LIB_DIR)/gallium/$(LIBNAME)
 
 $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
 	$(MKLIB) -noprefix -o $@ \
-		$(OBJECTS) $(PIPE_DRIVERS) $(MESA_MODULES)  $(WINOBJ) $(DRI_LIB_DEPS) $(DRIVER_EXTRAS)
+		$(OBJECTS) $(PIPE_DRIVERS) \
+                -Wl,--start-group $(MESA_MODULES) -Wl,--end-group \
+                 $(WINOBJ) $(DRI_LIB_DEPS) $(DRIVER_EXTRAS)
 
 $(LIBNAME_EGL): $(WINSYS_OBJECTS) $(LIBS)
 	$(MKLIB) -o $(LIBNAME_EGL) \