apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r384716 - /apr/apr/branches/1.2.x/test/Makefile.in
Date Fri, 10 Mar 2006 06:41:41 GMT
Author: wrowe
Date: Thu Mar  9 22:41:40 2006
New Revision: 384716

URL: http://svn.apache.org/viewcvs?rev=384716&view=rev
Log:

  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

Modified:
    apr/apr/branches/1.2.x/test/Makefile.in

Modified: apr/apr/branches/1.2.x/test/Makefile.in
URL: http://svn.apache.org/viewcvs/apr/apr/branches/1.2.x/test/Makefile.in?rev=384716&r1=384715&r2=384716&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/test/Makefile.in (original)
+++ apr/apr/branches/1.2.x/test/Makefile.in Thu Mar  9 22:41:40 2006
@@ -37,9 +37,9 @@
 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 \



Mime
View raw message