Mesa (master): st/es: Pass -linker and -ldflags to mklib.
Chia-I Wu
olv at kemper.freedesktop.org
Sat Jan 23 12:34:49 UTC 2010
Module: Mesa
Branch: master
Commit: 60cd2449f8f2b698f0adacd4a401db13c5fa46f9
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=60cd2449f8f2b698f0adacd4a401db13c5fa46f9
Author: Chia-I Wu <olvaffe at gmail.com>
Date: Sat Jan 23 20:08:02 2010 +0800
st/es: Pass -linker and -ldflags to mklib.
---
src/gallium/state_trackers/es/Makefile | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gallium/state_trackers/es/Makefile b/src/gallium/state_trackers/es/Makefile
index 095ffbb..b036551 100644
--- a/src/gallium/state_trackers/es/Makefile
+++ b/src/gallium/state_trackers/es/Makefile
@@ -49,7 +49,7 @@ default: $(TOP)/$(LIB_DIR)/$(GLES_1_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLES_2_LIB_NAM
# Make the shared libs
$(TOP)/$(LIB_DIR)/$(GLES_1_LIB_NAME): $(ES1_OBJECTS) $(ES1_LIBS) $(GALLIUM_AUXILIARIES)
- $(MKLIB) -o $(GLES_1_LIB) \
+ $(MKLIB) -o $(GLES_1_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-major $(GLES_1_VERSION_MAJOR) \
-minor $(GLES_1_VERSION_MINOR) \
-patch $(GLES_1_VERSION_PATCH) \
@@ -59,7 +59,7 @@ $(TOP)/$(LIB_DIR)/$(GLES_1_LIB_NAME): $(ES1_OBJECTS) $(ES1_LIBS) $(GALLIUM_AUXIL
$(GALLIUM_AUXILIARIES) $(SYS_LIBS)
$(TOP)/$(LIB_DIR)/$(GLES_2_LIB_NAME): $(ES2_OBJECTS) $(ES1_LIBS) $(GALLIUM_AUXILIARIES)
- $(MKLIB) -o $(GLES_2_LIB) \
+ $(MKLIB) -o $(GLES_2_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-major $(GLES_2_VERSION_MAJOR) \
-minor $(GLES_2_VERSION_MINOR) \
-patch $(GLES_2_VERSION_PATCH) \
More information about the mesa-commit
mailing list