diff options
| author | Graham Leggett <minfrin@apache.org> | 2019-08-17 10:09:32 +0000 |
|---|---|---|
| committer | Graham Leggett <minfrin@apache.org> | 2019-08-17 10:09:32 +0000 |
| commit | a1e6225e65054e86efd1908f9d4470e7d033783b (patch) | |
| tree | d564820f91e73d5094392bf0dabccebd488fdf0b | |
| parent | b6e316942278593c493d9077a64dd08bab527b9b (diff) | |
| download | apr-a1e6225e65054e86efd1908f9d4470e7d033783b.tar.gz | |
Add --tag=CC to libtool invocations. PR 62640.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1865343 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | test/Makefile.in | 8 |
4 files changed, 10 insertions, 8 deletions
@@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes for APR 2.0.0 + *) Add --tag=CC to libtool invocations. PR 62640. [Michael Osipov] + *) apr_thread_exit() is now a void function. [Joe Orton] *) apr_dir_read(): The returned finfo->name field is now duplicated diff --git a/Makefile.in b/Makefile.in index 8008f4189..3d4d880f9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -34,7 +34,7 @@ INSTALL_DATA = @INSTALL_DATA@ EXTRA_OBJECTS = @EXTRA_OBJECTS@ APR_DSO_MODULES = @APR_DSO_MODULES@ -LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(APRUTIL_LDFLAGS) -release $(APR_MAJOR_VERSION) -module -rpath $(APR_DSO_LIBDIR) +LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link --tag=CC $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(APRUTIL_LDFLAGS) -release $(APR_MAJOR_VERSION) -module -rpath $(APR_DSO_LIBDIR) APR_DSO_LIBDIR = @APR_DSO_LIBDIR@ APRUTIL_EXPORT_LIBS = @APRUTIL_EXPORT_LIBS@ @@ -175,7 +175,7 @@ include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@ $(APR_MKDIR) include/private tools/gen_test_char@EXEEXT@ > $@ -LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \ +LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link --tag=CC $(COMPILE) $(LT_LDFLAGS) \ @LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@ # DO NOT REMOVE diff --git a/configure.in b/configure.in index e40b05382..0e2b08e30 100644 --- a/configure.in +++ b/configure.in @@ -297,9 +297,9 @@ AC_ARG_WITH(libtool, [ --without-libtool avoid using libtool to link the [ use_libtool=$withval ], [ use_libtool="yes" ] ) if test "x$use_libtool" = "xyes"; then - lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -o $@ -c $< && touch $@' + lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile --tag=CC $(COMPILE) -o $@ -c $< && touch $@' LT_VERSION="-version-info `$get_version libtool $version_hdr APR`" - link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(COMPILE) \$(LT_LDFLAGS) \$(LT_VERSION) \$(ALL_LDFLAGS) -o \$@" + link="\$(LIBTOOL) \$(LTFLAGS) --mode=link --tag=CC \$(COMPILE) \$(LT_LDFLAGS) \$(LT_VERSION) \$(ALL_LDFLAGS) -o \$@" so_ext='lo' lib_target='-rpath $(libdir) $(OBJECTS)' export_lib_target='-rpath \$(libdir) \$(OBJECTS)' diff --git a/test/Makefile.in b/test/Makefile.in index efd1492fd..d0899197f 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -76,7 +76,7 @@ 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 $(COMPILE) $(LT_LDFLAGS) \ +LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link --tag=CC $(COMPILE) $(LT_LDFLAGS) \ @LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@ # STDTEST_PORTABLE; @@ -124,18 +124,18 @@ globalmutexchild@EXEEXT@: $(OBJECTS_globalmutexchild) # Note -prefer-pic is only supported with libtool-1.4+ mod_test.lo: $(srcdir)/mod_test.c - $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -prefer-pic -o $@ \ + $(LIBTOOL) $(LTFLAGS) --mode=compile --tag=CC $(COMPILE) -prefer-pic -o $@ \ -c $(srcdir)/mod_test.c OBJECTS_mod_test = mod_test.lo mod_test.la: $(OBJECTS_mod_test) $(LOCAL_LIBS) - $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -rpath `pwd` -module \ + $(LIBTOOL) $(LTFLAGS) --mode=link --tag=CC $(COMPILE) -rpath `pwd` -module \ -avoid-version $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ \ $(OBJECTS_mod_test) $(LOCAL_LIBS) OBJECTS_libmod_test = mod_test.lo $(LOCAL_LIBS) libmod_test.la: $(OBJECTS_libmod_test) - $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -rpath `pwd` \ + $(LIBTOOL) $(LTFLAGS) --mode=link --tag=CC $(COMPILE) -rpath `pwd` \ -avoid-version $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ \ $(OBJECTS_libmod_test) $(ALL_LIBS) |