Mesa (master): st/es: Remove unnedded --whole-archive.

Chia-I Wu olv at kemper.freedesktop.org
Mon Apr 5 20:39:36 PDT 2010


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

Author: Chia-I Wu <olv at lunarg.com>
Date:   Mon Apr  5 18:38:55 2010 +0800

st/es: Remove unnedded --whole-archive.

All public functions in the archives are either directly referenced or
indirectly referenced by _glapi_get_proc_address.  There is no need for
--whole-archive.

---

 src/gallium/state_trackers/es/Makefile |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/gallium/state_trackers/es/Makefile b/src/gallium/state_trackers/es/Makefile
index 089d441..7370634 100644
--- a/src/gallium/state_trackers/es/Makefile
+++ b/src/gallium/state_trackers/es/Makefile
@@ -22,6 +22,8 @@ GLES_2_LIB = GLESv2
 GLES_2_LIB_NAME = lib$(GLES_2_LIB).so
 
 
+# These two objects indirectly reference all public functions thanks to the use
+# of _glapi_get_proc_address.
 ES1_OBJECTS = st_es1.o
 ES2_OBJECTS = st_es2.o
 
@@ -56,9 +58,7 @@ $(TOP)/$(LIB_DIR)/$(GLES_1_LIB_NAME): $(ES1_OBJECTS) $(ES1_LIBS) $(GALLIUM_AUXIL
 		-minor $(GLES_1_VERSION_MINOR) \
 		-patch $(GLES_1_VERSION_PATCH) \
 		-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
-		$(ES1_OBJECTS) \
-		-Wl,--whole-archive $(ES1_LIBS) -Wl,--no-whole-archive \
-		$(GALLIUM_AUXILIARIES) $(SYS_LIBS)
+		$(ES1_OBJECTS) $(ES1_LIBS) $(GALLIUM_AUXILIARIES) $(SYS_LIBS)
 
 $(TOP)/$(LIB_DIR)/$(GLES_2_LIB_NAME): $(ES2_OBJECTS) $(ES1_LIBS) $(GALLIUM_AUXILIARIES)
 	$(MKLIB) -o $(GLES_2_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
@@ -66,9 +66,7 @@ $(TOP)/$(LIB_DIR)/$(GLES_2_LIB_NAME): $(ES2_OBJECTS) $(ES1_LIBS) $(GALLIUM_AUXIL
 		-minor $(GLES_2_VERSION_MINOR) \
 		-patch $(GLES_2_VERSION_PATCH) \
 		-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
-		$(ES2_OBJECTS) \
-		-Wl,--whole-archive $(ES2_LIBS) -Wl,--no-whole-archive \
-		$(GALLIUM_AUXILIARIES) $(SYS_LIBS)
+		$(ES2_OBJECTS) $(ES2_LIBS) $(GALLIUM_AUXILIARIES) $(SYS_LIBS)
 
 install: default
 	$(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GLES



More information about the mesa-commit mailing list