From 800959471b59bb2dcfc990e518491762e6d834b7 Mon Sep 17 00:00:00 2001 From: Roumen Petrov Date: Tue, 11 Nov 2008 22:24:25 +0100 Subject: [PATCH] Fix destdir tests in cross compile mode. * tests/destdir.at (Simple DESTDIR install) (DESTDIR with in-package deplibs): Use $EXEEXT throughout. * THANKS: Update. Signed-off-by: Ralf Wildenhues --- ChangeLog | 7 +++++++ THANKS | 1 + tests/destdir.at | 8 ++++---- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b6afb090..fd5c82b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-11-11 Roumen Petrov (tiny change) + + Fix destdir tests in cross compile mode. + * tests/destdir.at (Simple DESTDIR install) + (DESTDIR with in-package deplibs): Use $EXEEXT throughout. + * THANKS: Update. + 2008-11-11 Ralf Wildenhues Simplify cwrapper handling a bit. diff --git a/THANKS b/THANKS index 08971f93..2f18f626 100644 --- a/THANKS +++ b/THANKS @@ -128,6 +128,7 @@ Robert Ögren lists@roboros.com Roberto Bagnara bagnara@cs.unipr.it Roland Mainz roland.mainz@nrubsig.org + Roumen Petrov bugtrack@roumenpetrov.info Sam Thursfield ssssam@gmail.com Sebastian Wilhelmi wilhelmi@ira.uka.de Simon Josefsson jas@extundo.com diff --git a/tests/destdir.at b/tests/destdir.at index 8ce8df35..386c7287 100644 --- a/tests/destdir.at +++ b/tests/destdir.at @@ -56,7 +56,7 @@ $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a.c $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la a.lo -rpath $libdir echo 'extern int a(); int main() { return a(); }' > m.c $CC $CPPFLAGS $CFLAGS -c m.c -$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m m.$OBJEXT liba.la +$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m$EXEEXT m.$OBJEXT liba.la mkdir $DESTDIR$libdir $DESTDIR$bindir AT_CHECK([$LIBTOOL --mode=install cp liba.la $DESTDIR$libdir/liba.la], [], [ignore], [ignore]) @@ -67,7 +67,7 @@ LT_AT_MVDIR(["$DESTDIR$libdir"], ["$libdir"]) LT_AT_MVDIR(["$DESTDIR$bindir"], ["$bindir"]) # We ignore failure on purpose here: we may not be root. AT_CHECK([$LIBTOOL --mode=finish $libdir], [ignore], [ignore], [ignore]) -LT_AT_EXEC_CHECK([$bindir/m]) +LT_AT_EXEC_CHECK([$bindir/m$EXEEXT]) AT_CLEANUP @@ -91,7 +91,7 @@ $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a.c $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la a.lo -rpath $libdir liba1dep.la liba2dep.la echo 'extern int a(); int main() { return a(); }' > m.c $CC $CPPFLAGS $CFLAGS -c m.c -$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m m.$OBJEXT liba.la +$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m$EXEEXT m.$OBJEXT liba.la mkdir $DESTDIR$libdir $DESTDIR${libdir}2 $DESTDIR$bindir AT_CHECK([$LIBTOOL --mode=install cp liba1dep.la $DESTDIR$libdir/liba1dep.la], [], [ignore], [ignore]) @@ -124,7 +124,7 @@ for lib in a1dep a2dep a; do $LIBTOOL --mode=install cp lib$lib.la $DESTDIR$ldir/lib$lib.la done -LT_AT_EXEC_CHECK([$bindir/m]) +LT_AT_EXEC_CHECK([$bindir/m$EXEEXT]) # TODO: make this more portable: if test "$OBJDUMP" != false && ($OBJDUMP -p $bindir/m$EXEEXT) >/dev/null 2>&1; then