summaryrefslogtreecommitdiff
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorChristopher James Halse Rogers <christopher.halse.rogers@canonical.com>2011-01-23 20:22:47 -0800
committerBrian Paul <brianp@vmware.com>2011-01-24 07:53:24 -0700
commit7d6abd254a46e37a27401c3ae0ce0645d8b0decd (patch)
treebc07e6b5a231373668777bee363046557db220e4 /src/mesa/drivers
parentbe0665b461c776e2c4444330a865134e53f3d121 (diff)
osmesa: mklib requires arguments before objects
Fixes the build when selecting driver=osmesa and building static libraries. Otherwise, mklib tries to add the ‘-ltalloc’ object to the archive, which obviously fails. Clients which statically link to osmesa will need to link to libtalloc also, as specified in the Libs.private of osmesa.pc. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=33360 NOTE: This is a candidate for the 7.10 branch. Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> Signed-off-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/osmesa/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/osmesa/Makefile b/src/mesa/drivers/osmesa/Makefile
index 50dd4526e1..d65128c4eb 100644
--- a/src/mesa/drivers/osmesa/Makefile
+++ b/src/mesa/drivers/osmesa/Makefile
@@ -40,7 +40,7 @@ $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OBJECTS) $(CORE_MESA)
-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
-install $(TOP)/$(LIB_DIR) -cplusplus $(MKLIB_OPTIONS) \
-id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
- $(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA) $(TALLOC_LIBS)
+ $(OSMESA_LIB_DEPS) $(TALLOC_LIBS) $(OBJECTS) $(CORE_MESA)