diff options
| author | michaelo <michaelo@13f79535-47bb-0310-9956-ffa450edef68> | 2021-05-24 21:36:10 +0000 |
|---|---|---|
| committer | michaelo <michaelo@13f79535-47bb-0310-9956-ffa450edef68> | 2021-05-24 21:36:10 +0000 |
| commit | b17a6420f9b3ffc3549bac01a9ab08f9c8311e61 (patch) | |
| tree | 46b42f84bee451241c54a83328ee9acb8bdea42a | |
| parent | b57a2acdd452a57534eb4c5753fcea2090640674 (diff) | |
| download | libapr-b17a6420f9b3ffc3549bac01a9ab08f9c8311e61.tar.gz | |
Backport r1865793 from 1.7.x:
Add --tag=CC to libtool invocations. PR 62640. [Michael Osipov]
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1890174 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | test/Makefile.in | 8 |
4 files changed, 9 insertions, 7 deletions
@@ -6,6 +6,8 @@ Changes for APR 1.6.6 events are emitted on pool clear/destroy for proper accounting. [Brane Čibej] + *) Add --tag=CC to libtool invocations. PR 62640. [Michael Osipov] + Changes for APR 1.6.5 *) Fix Win32 build breakage in apr_os_exp_time_put() in 1.6.4. [Rainer Jung] diff --git a/Makefile.in b/Makefile.in index cc54e9cef..4518cc5e4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -144,7 +144,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 be6777f7b..c23870a44 100644 --- a/configure.in +++ b/configure.in @@ -280,9 +280,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 7289851f9..2bfa3fe0f 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -67,7 +67,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; @@ -115,18 +115,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) |