diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2006-03-10 06:41:40 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2006-03-10 06:41:40 +0000 |
| commit | 1466d1d5e1c9fefe581657f104394b911879b5c9 (patch) | |
| tree | 741183421ac2f10db7bbfe7420b197e735f72b5e | |
| parent | 2cc08d889ffb8b3369f66341fbaab4b1e6ad89e2 (diff) | |
| download | libapr-1466d1d5e1c9fefe581657f104394b911879b5c9.tar.gz | |
Throw away a horrible change; each time we layer on more garbage to libtool
et al we've caused apr to fail in more peculiar ways on more platforms.
In this case, let libtool do exactly what we want, which is to resolve the
build-path flavor of libapr-1.la and test exactly what we've most recently
changed (and, for that matter, to have make check function whatsoever before
the library has been installed.)
Backports: 384715
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.2.x@384716 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | test/Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index dbbe0fbc1..5ddf431f8 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -37,9 +37,9 @@ CLEAN_SUBDIRS = internal INCDIR=../include INCLUDES=-I$(INCDIR) -I$(srcdir)/../include -# link programs using -no-install to get real executables not -# libtool wrapper scripts which link an executable when first run. -LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) -no-install $(ALL_LDFLAGS) -o $@ +# uses libtool wrapper scripts which ensures we are testing the currently built +# library in ../.libs/, not the installed/stale flavor due to -rpath. +LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) $(ALL_LDFLAGS) -o $@ check: $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE) for prog in $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE); do \ |