Merge branch 'master' of git+ssh://znh@git.freedesktop.org/git/mesa/mesa into 965-glsl

1 files changed, 7 insertions, 0 deletions

diff --git a/bin/mklib b/bin/mklib
index 09f4fac9e5..8ee8d8ce49 100755
--- a/bin/mklib
+++ b/bin/mklib
@@ -100,6 +100,13 @@ do
 	-L*)
 	    DEPS="$DEPS $1"
 	    ;;
+	-pthread)
+	    # this is a special case (see bugzilla 10876)
+	    DEPS="$DEPS $1"
+	    ;;
+	'-pthread')
+	    DEPS="$DEPS -pthread"
+	    ;;
 	'-cplusplus')
 	    CPLUSPLUS=1
 	    ;;