Attachment 37422 Details for Bug 29282 – Have mklib exit with error code if link fails

[patch] Have mklib exit with error code if link fails

0001-Cygwin-Have-mklib-exit-with-error-code-if-link-fails.patch (text/plain), 1.33 KB, created by Jon Turney on 2010-07-28 08:56:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jon Turney

Created: 2010-07-28 08:56:48 UTC

Size: 1.33 KB

patch

obsolete

>From ff5a2e444f2cd6285daa0bebd60519548e8f24ee Mon Sep 17 00:00:00 2001
>From: Jon TURNEY <jon.turney@dronecode.org.uk>
>Date: Fri, 19 Feb 2010 22:38:57 +0000
>Subject: [PATCH 1/3] Cygwin: Have mklib exit with error code if link fails
>
>
>Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
>---
> 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
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 29282: 37422 | 37423 | 37424 | 38305

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.