Mesa (master): Cygwin: Have mklib exit with error code if link fails

[Brian Paul]

Module: Mesa
Branch: master
Commit: 8fee182e8c65625677c10137e12775db63e909a2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8fee182e8c65625677c10137e12775db63e909a2

Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Fri Feb 19 22:38:57 2010 +0000

Cygwin: Have mklib exit with error code if link fails

Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
Signed-off-by: Brian Paul <brianp at vmware.com>

---

 bin/mklib |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/bin/mklib b/bin/mklib
index c2760e5..e2b854f 100755
--- a/bin/mklib
+++ b/bin/mklib
@@ -938,7 +938,7 @@ case $ARCH in
                 OPTS=${ALTOPTS}
             fi
 	    rm -f ${LIBNAME}
-	    ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
+	    ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS} || exit $?
 	    FINAL_LIBS=${LIBNAME}
         else
 	CYGNAME="cyg${LIBNAME}"     # prefix with "cyg"
@@ -979,12 +979,7 @@ case $ARCH in
             rm -f ${LIBNAME}.a
 
             # make lib
-            ${LINK} ${OPTS} ${LDFLAGS} -o ${CYGNAME}-${MAJOR}.dll ${OBJECTS} ${DEPS}
-            # make build fail if link failed
-            es=$?
-            if [ "$es" -ne "0" ]; then
-                exit $es
-            fi
+            ${LINK} ${OPTS} ${LDFLAGS} -o ${CYGNAME}-${MAJOR}.dll ${OBJECTS} ${DEPS} || exit $?
             # make usual symlinks
             ln -s ${LIBNAME}-${MAJOR}.dll.a ${LIBNAME}.dll.a
             # finish up