diff options
| author | Bruno Haible <bruno@clisp.org> | 2020-11-07 21:07:04 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2020-11-07 21:07:04 +0100 |
| commit | f570a82be35e36832adf0344d8d4e983c8db9e1a (patch) | |
| tree | c0fb549e83c9babfcf86b88b4c11fab2aa487538 /pygnulib/GLEmiter.py | |
| parent | c59c21ad62b3c6c8151bc62b7a28776b6c067293 (diff) | |
| download | gnulib-f570a82be35e36832adf0344d8d4e983c8db9e1a.tar.gz | |
gnulib-tool: Fix link error with 'version-etc' (regression 2020-05-29).
Reported by Simon Josefsson in
<https://lists.gnu.org/archive/html/bug-gnulib/2020-11/msg00032.html>.
* gnulib-tool (func_emit_tests_Makefile_am): Add libtests.a to
LDADD a third time, after the second occurrence of ../lib/libgnu.a.
* pygnulib/GLEmiter.py (tests_Makefile_am): Likewise.
Diffstat (limited to 'pygnulib/GLEmiter.py')
| -rw-r--r-- | pygnulib/GLEmiter.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pygnulib/GLEmiter.py b/pygnulib/GLEmiter.py index 441d2956d8..107f88cf21 100644 --- a/pygnulib/GLEmiter.py +++ b/pygnulib/GLEmiter.py @@ -1125,14 +1125,15 @@ AC_DEFUN([%V1%_LIBSOURCES], [ if libtests: # All test programs need to be linked with libtests.a. - # It needs to be passed to the linker before ${libname}.${libext}, since - # the tests-related modules depend on the main modules. + # It needs to be passed to the linker before ${libname}.${libext}, + # since the tests-related modules depend on the main modules. # It also needs to be passed to the linker after ${libname}.${libext} # because the latter might contain incomplete modules (such as the - # 'error' module whose dependency to 'progname' is voluntarily omitted). - # The LIBTESTS_LIBDEPS can be passed to the linker once or twice, it does - # not matter. - emit += 'LDADD = libtests.a %s/%s/%s.%s libtests.a %s/%s/%s.%s $(LIBTESTS_LIBDEPS)\n\n' % \ + # 'version-etc' module whose dependency to 'version-etc-fsf' is + # voluntarily omitted). + # The LIBTESTS_LIBDEPS can be passed to the linker once or twice, it + # does not matter. + emit += 'LDADD = libtests.a %s/%s/%s.%s libtests.a %s/%s/%s.%s libtests.a $(LIBTESTS_LIBDEPS)\n\n' % \ (testsbase_inverse, sourcebase, libname, libext, testsbase_inverse, sourcebase, libname, libext) else: |