Skip to content

Commit

Permalink
tests: use our own generated libtool, not the one in $PATH
Browse files Browse the repository at this point in the history
libtoolize creates a version of libtool for the right architecture
in $(top_builddir), which is guaranteed to be present, and is
guaranteed to match what we are compiling (even during
cross-compilation).

Packaging systems sometimes separate /usr/bin/libtool, which is
specific to one architecture, from the libtool development files
such as libtoolize and ltmain.sh, which are architecture-independent.
For example, in Debian, libtool_*_all.deb contains the files necessary
to libtoolize a package and is depended on by the dh-autoreconf package,
but libtool-bin_*_amd64.deb (or whatever architecture) contains
/usr/bin/libtool and is not normally necessary to depend on.

Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #367
Approved by: cgwalters
  • Loading branch information
smcv authored and rh-atomic-bot committed Jun 26, 2016
1 parent f38c33f commit ca899cc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile-tests.am
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ ALL_LOCAL_RULES += tests/libreaddir-rand.so
CLEANFILES += tests/libreaddir-rand.so tests/ostree-symlink-stamp tests/ostree

tests/ostree-symlink-stamp: Makefile
@real_bin=`cd $(top_builddir) && libtool --mode=execute echo ostree`; \
@real_bin=`cd $(top_builddir) && ./libtool --mode=execute echo ostree`; \
ln -sf "$${real_bin}" tests/ostree; \
touch $@

Expand Down

0 comments on commit ca899cc

Please sign in to comment.