--- mesa/bin/mklib.old	2004-06-25 14:08:41.000000000 +0100
+++ mesa/bin/mklib	2004-06-25 14:23:09.000000000 +0100
@@ -64,6 +64,7 @@
 	'-install')   shift 1; INSTALLDIR=$1;;
 	'-arch')      shift 1; ARCH=$1;;
 	'-archopt')   shift 1; ARCHOPT=$1;;
+	-Wl*)	      DEPS="$DEPS $1";;
 	-*)           echo "mklib: Unknown option: " $1 ; exit 1;;
 	*) break
     esac
@@ -137,9 +138,9 @@
             echo "mklib: Making" $ARCH "shared library: " ${LIBNAME}.so.${VERSION}
 
             if [ $CPLUSPLUS = 1 ] ; then
-                LINK="g++"
+                LINK="$CXX"
             else
-                LINK="gcc"
+                LINK="$CC"
             fi
 
             # rm any old libs