From: Chia-I Wu <olv@lunarg.com>
Date: Tue, 28 Jun 2011 06:23:20 +0000 (+0900)
Subject: targets/egl-static: fix library search order
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=24137afb315007c4e686b494d4565c5bd3d2d97f;p=mesa.git

targets/egl-static: fix library search order

Use

  $(MKLIB) -ldflags '-L$(TOP)/$(LIB_DIR)'

instead of

  $(MKLIB) -L$(TOP)/$(LIB_DIR)

to make sure the local library path appears before system's.
---

diff --git a/src/gallium/targets/egl-static/Makefile b/src/gallium/targets/egl-static/Makefile
index 6b5ed602992..832d7ba438f 100644
--- a/src/gallium/targets/egl-static/Makefile
+++ b/src/gallium/targets/egl-static/Makefile
@@ -173,14 +173,14 @@ default: $(OUTPUTS)
 
 $(OUTPUT_PATH)/egl_gallium.so: $(egl_OBJECTS) $(egl_LIBS)
 	$(MKLIB) -o $(notdir $@) -noprefix -linker '$(CXX)' \
-		-L$(TOP)/$(LIB_DIR) -ldflags '-Wl,--no-undefined $(LDFLAGS)' \
+		-ldflags '-L$(TOP)/$(LIB_DIR) -Wl,--no-undefined $(LDFLAGS)' \
 		-cplusplus -install $(OUTPUT_PATH) $(MKLIB_OPTIONS) \
 		$(egl_OBJECTS) -Wl,--start-group $(egl_LIBS) -Wl,--end-group \
 		$(egl_SYS)
 
 $(OUTPUT_PATH)/st_GL.so: st_GL.o $(st_GL_LIBS)
 	$(MKLIB) -o $(notdir $@) -noprefix -linker '$(CXX)' \
-		-L$(TOP)/$(LIB_DIR) -ldflags '$(LDFLAGS)' \
+		-ldflags '-L$(TOP)/$(LIB_DIR) $(LDFLAGS)' \
 		-cplusplus -install $(OUTPUT_PATH) $(MKLIB_OPTIONS) \
 		$< -Wl,--start-group $(st_GL_LIBS) -Wl,--end-group \
 		$(st_GL_SYS)