Cygwin: Have mklib exit with error code if link fails
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
parent
63b80f8cc1
commit
8fee182e8c
|
@ -938,7 +938,7 @@ case $ARCH in
|
||||||
OPTS=${ALTOPTS}
|
OPTS=${ALTOPTS}
|
||||||
fi
|
fi
|
||||||
rm -f ${LIBNAME}
|
rm -f ${LIBNAME}
|
||||||
${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
|
${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS} || exit $?
|
||||||
FINAL_LIBS=${LIBNAME}
|
FINAL_LIBS=${LIBNAME}
|
||||||
else
|
else
|
||||||
CYGNAME="cyg${LIBNAME}" # prefix with "cyg"
|
CYGNAME="cyg${LIBNAME}" # prefix with "cyg"
|
||||||
|
@ -979,12 +979,7 @@ case $ARCH in
|
||||||
rm -f ${LIBNAME}.a
|
rm -f ${LIBNAME}.a
|
||||||
|
|
||||||
# make lib
|
# make lib
|
||||||
${LINK} ${OPTS} ${LDFLAGS} -o ${CYGNAME}-${MAJOR}.dll ${OBJECTS} ${DEPS}
|
${LINK} ${OPTS} ${LDFLAGS} -o ${CYGNAME}-${MAJOR}.dll ${OBJECTS} ${DEPS} || exit $?
|
||||||
# make build fail if link failed
|
|
||||||
es=$?
|
|
||||||
if [ "$es" -ne "0" ]; then
|
|
||||||
exit $es
|
|
||||||
fi
|
|
||||||
# make usual symlinks
|
# make usual symlinks
|
||||||
ln -s ${LIBNAME}-${MAJOR}.dll.a ${LIBNAME}.dll.a
|
ln -s ${LIBNAME}-${MAJOR}.dll.a ${LIBNAME}.dll.a
|
||||||
# finish up
|
# finish up
|
||||||
|
|
Loading…
Reference in New Issue