Mesa (master): winsys/drm: Update the options of mklib in Makefile.egl_g3d.

Chia-I Wu olv at kemper.freedesktop.org
Fri Jan 22 08:50:15 UTC 2010


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

Author: Chia-I Wu <olvaffe at gmail.com>
Date:   Fri Jan 22 16:25:11 2010 +0800

winsys/drm: Update the options of mklib in Makefile.egl_g3d.

Pass -linker, -ldflags, and $(MKLIB_OPTIONS) to mklib.

---

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

diff --git a/src/gallium/winsys/drm/Makefile.egl_g3d b/src/gallium/winsys/drm/Makefile.egl_g3d
index 3ce2725..d8f4739 100644
--- a/src/gallium/winsys/drm/Makefile.egl_g3d
+++ b/src/gallium/winsys/drm/Makefile.egl_g3d
@@ -39,7 +39,8 @@ $(EGL_DISPLAY_LIBS): $(LIB_GALLIUM_DIR)/%.so: %.so
 	$(INSTALL) $^ $(LIB_GALLIUM_DIR)
 
 define mklib-egl
-$(MKLIB) -noprefix -o $@ $(EGL_DRIVER_OBJECTS) \
+$(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+	$(MKLIB_OPTIONS) $(EGL_DRIVER_OBJECTS) \
 	-Wl,--whole-archive $($(1)_ST) -Wl,--no-whole-archive \
 	$(EGL_DRIVER_PIPES) $(GALLIUM_AUXILIARIES) $($(1)_LIBS) $(EGL_DRIVER_LIBS)
 endef




More information about the mesa-commit mailing list