OLD | NEW |
1 diff --git a/bin/mklib b/bin/mklib | 1 diff --git a/bin/mklib b/bin/mklib |
2 --- a/bin/mklib | 2 --- a/bin/mklib |
3 +++ b/bin/mklib | 3 +++ b/bin/mklib |
4 @@ -39,7 +39,7 @@ CPLUSPLUS=0 | 4 @@ -39,7 +39,7 @@ CPLUSPLUS=0 |
5 STATIC=0 | 5 STATIC=0 |
6 DLOPEN=0 | 6 DLOPEN=0 |
7 INSTALLDIR="." | 7 INSTALLDIR="." |
8 -ARCH="auto" | 8 -ARCH="auto" |
9 +ARCH="nacl" | 9 +ARCH="nacl" |
10 ARCHOPT="" | 10 ARCHOPT="" |
(...skipping 23 matching lines...) Expand all Loading... |
34 # -linker was not specified so set default link command now | 34 # -linker was not specified so set default link command now |
35 if [ $CPLUSPLUS = 1 ] ; then | 35 if [ $CPLUSPLUS = 1 ] ; then |
36 - LINK=g++ | 36 - LINK=g++ |
37 + LINK=${CXX} # g++ | 37 + LINK=${CXX} # g++ |
38 else | 38 else |
39 - LINK=gcc | 39 - LINK=gcc |
40 + LINK=${CC} # gcc | 40 + LINK=${CC} # gcc |
41 fi | 41 fi |
42 fi | 42 fi |
43 | 43 |
44 @@ -271,7 +276,7 @@ case $ARCH in | 44 @@ -271,8 +276,8 @@ case $ARCH in |
45 elif [ $STATIC = 1 ] ; then | 45 elif [ $STATIC = 1 ] ; then |
46 LIBNAME="lib${LIBNAME}.a" # prefix with "lib", suffix with ".a" | 46 LIBNAME="lib${LIBNAME}.a" # prefix with "lib", suffix with ".a" |
47 echo "mklib: Making" $ARCH "static library: " ${LIBNAME} | 47 echo "mklib: Making" $ARCH "static library: " ${LIBNAME} |
48 - LINK="ar" | 48 - LINK="ar" |
| 49 - OPTS="-ru" |
49 + LINK=${AR} # "ar" | 50 + LINK=${AR} # "ar" |
50 OPTS="-ru" | 51 + OPTS="ru" |
51 if [ "${ALTOPTS}" ] ; then | 52 if [ "${ALTOPTS}" ] ; then |
52 OPTS=${ALTOPTS} | 53 OPTS=${ALTOPTS} |
| 54 fi |
53 @@ -285,8 +290,8 @@ case $ARCH in | 55 @@ -285,8 +290,8 @@ case $ARCH in |
54 case $OBJ in | 56 case $OBJ in |
55 *.a) | 57 *.a) |
56 # extract the .o files from this .a archive | 58 # extract the .o files from this .a archive |
57 - FILES=`ar t $OBJ` | 59 - FILES=`ar t $OBJ` |
58 - ar x $OBJ | 60 - ar x $OBJ |
59 + FILES=`${AR} t $OBJ` | 61 + FILES=`${AR} t $OBJ` |
60 + ${AR} x $OBJ | 62 + ${AR} x $OBJ |
61 NEWOBJECTS="$NEWOBJECTS $FILES" | 63 NEWOBJECTS="$NEWOBJECTS $FILES" |
62 # keep track of temporary .o files and delete them below | 64 # keep track of temporary .o files and delete them below |
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
213 +++ b/src/mesa/vbo/vbo_exec_array.c | 215 +++ b/src/mesa/vbo/vbo_exec_array.c |
214 @@ -149,7 +149,7 @@ check_array_data(GLcontext *ctx, struct gl_client_array *arr
ay, | 216 @@ -149,7 +149,7 @@ check_array_data(GLcontext *ctx, struct gl_client_array *arr
ay, |
215 array->Ptr, array->BufferObj->Name); | 217 array->Ptr, array->BufferObj->Name); |
216 f[k] = 1.0; /* XXX replace the bad value! */ | 218 f[k] = 1.0; /* XXX replace the bad value! */ |
217 } | 219 } |
218 - //assert(!IS_INF_OR_NAN(f[k])); | 220 - //assert(!IS_INF_OR_NAN(f[k])); |
219 + /* assert(!IS_INF_OR_NAN(f[k])); */ | 221 + /* assert(!IS_INF_OR_NAN(f[k])); */ |
220 } | 222 } |
221 } | 223 } |
222 break; | 224 break; |
OLD | NEW |