diff options
| author | Chia-I Wu <olv@lunarg.com> | 2010-03-10 10:12:45 +0800 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2010-03-10 10:14:17 +0800 |
| commit | 9a8342ebcd83a2022b3c9b9539c5b15ac56d6440 (patch) | |
| tree | 9b47f7178086cd5356f2b7fe32ed36a337d21cf7 /src/gallium | |
| parent | 1f92cf55e1d19864a51e620a14c6912e94cd14ea (diff) | |
winsys/drm: Handle circular dependencies in Makefile.egl.
The libraries have circular dependencies. Use --start-group and
--end-group when producing the final shared libraries.
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/winsys/drm/Makefile.egl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/winsys/drm/Makefile.egl b/src/gallium/winsys/drm/Makefile.egl index a006ad70b6..bc5dd3a53b 100644 --- a/src/gallium/winsys/drm/Makefile.egl +++ b/src/gallium/winsys/drm/Makefile.egl @@ -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 |