winsys/drm: Handle circular dependencies in Makefile.egl.
authorChia-I Wu <olv@lunarg.com>
Wed, 10 Mar 2010 02:12:45 +0000 (10:12 +0800)
committerChia-I Wu <olv@lunarg.com>
Wed, 10 Mar 2010 02:14:17 +0000 (10:14 +0800)
The libraries have circular dependencies.  Use --start-group and
--end-group when producing the final shared libraries.

src/gallium/winsys/drm/Makefile.egl

index a006ad70b69a5931d8527c2435ad113b0fadba11..bc5dd3a53b840815aea83b4239f14bec3c917710 100644 (file)
@@ -39,8 +39,10 @@ $(EGL_DISPLAY_LIBS): $(TOP)/$(LIB_DIR)/%.so: %.so
 
 define mklib-egl
 $(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-       $(MKLIB_OPTIONS) $(EGL_DRIVER_OBJECTS) $($(1)_ST) \
-       $(EGL_DRIVER_PIPES) $(GALLIUM_AUXILIARIES) $($(1)_LIBS) $(EGL_DRIVER_LIBS)
+       $(MKLIB_OPTIONS) $(EGL_DRIVER_OBJECTS) \
+       -Wl,--start-group $($(1)_ST) $(EGL_DRIVER_PIPES) \
+       $(GALLIUM_AUXILIARIES) -Wl,--end-group \
+       $($(1)_LIBS) $(EGL_DRIVER_LIBS)
 endef
 
 egl_x11_$(EGL_DRIVER_NAME).so: $(EGL_DRIVER_OBJECTS) $(x11_ST) $(EGL_DRIVER_PIPES) $(GALLIUM_AUXILIARIES) Makefile