diff options
| author | Chia-I Wu <[email protected]> | 2011-06-28 15:23:20 +0900 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2011-06-28 15:25:00 +0900 |
| commit | 24137afb315007c4e686b494d4565c5bd3d2d97f (patch) | |
| tree | bec7b8e910471b961760f77bedafe50a598648c4 | |
| parent | aa281dd3924cf76e24c0e8cbd971f58d082cd4cd (diff) | |
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.
| -rw-r--r-- | src/gallium/targets/egl-static/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
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) |