aboutsummaryrefslogtreecommitdiff
path: root/mesalib/bin
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-11-14 09:42:43 +0100
committermarha <marha@users.sourceforge.net>2011-11-14 09:42:43 +0100
commit93795f7d8ca73dd428a926901cbc632015ac0cf5 (patch)
tree3fdcae64c6a51d6512aa32387846a2f282439855 /mesalib/bin
parent00ea126522f5bbf5c4600ddb93a45b260475c8c1 (diff)
parent156e37d3879b316329e3e05579414031da2647e2 (diff)
downloadvcxsrv-93795f7d8ca73dd428a926901cbc632015ac0cf5.tar.gz
vcxsrv-93795f7d8ca73dd428a926901cbc632015ac0cf5.tar.bz2
vcxsrv-93795f7d8ca73dd428a926901cbc632015ac0cf5.zip
Merge remote-tracking branch 'origin/released'
Conflicts: libX11/src/util/makekeys.c
Diffstat (limited to 'mesalib/bin')
-rw-r--r--mesalib/bin/mklib2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/bin/mklib b/mesalib/bin/mklib
index fd87aad42..70bd1a27a 100644
--- a/mesalib/bin/mklib
+++ b/mesalib/bin/mklib
@@ -260,7 +260,7 @@ if [ $STATIC = 1 ]; then
NEWOBJECTS=""
for OBJ in $OBJECTS ; do
case $OBJ in
- -Wl,*)
+ -Wl,*|-L*|-l*)
echo "mklib: warning: ignoring $OBJ for static library"
;;
*)