diff options
| author | Bruno Haible <bruno@clisp.org> | 2020-05-30 03:17:19 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2020-05-30 03:23:56 +0200 |
| commit | 477c6e36110e1b2b52053dc82394ba23d102da2a (patch) | |
| tree | dc27c78aa8afc249221fe4ec4ad6e8377a122909 /pygnulib/GLEmiter.py | |
| parent | 5874dfe23488d0187f71d829088d2dcfe4d318f1 (diff) | |
| download | gnulib-477c6e36110e1b2b52053dc82394ba23d102da2a.tar.gz | |
gnulib-tool: Fix link errors with a particular set of modules on mingw.
* gnulib-tool (func_emit_tests_Makefile_am): Add ../lib/libgnu.a to
LDADD a second time, after the second occurrence of libtests.a.
* pygnulib/GLEmiter.py (tests_Makefile_am): Likewise.
Diffstat (limited to 'pygnulib/GLEmiter.py')
| -rw-r--r-- | pygnulib/GLEmiter.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pygnulib/GLEmiter.py b/pygnulib/GLEmiter.py index f0746f8278..441d2956d8 100644 --- a/pygnulib/GLEmiter.py +++ b/pygnulib/GLEmiter.py @@ -1123,8 +1123,6 @@ AC_DEFUN([%V1%_LIBSOURCES], [ (testsbase_inverse, sourcebase, testsbase_inverse, sourcebase) emit += '\n' - local_ldadd_before = string() - local_ldadd_after = string() if libtests: # All test programs need to be linked with libtests.a. # It needs to be passed to the linker before ${libname}.${libext}, since @@ -1134,11 +1132,12 @@ AC_DEFUN([%V1%_LIBSOURCES], [ # '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. - local_ldadd_before = ' libtests.a' - local_ldadd_after = ' libtests.a $(LIBTESTS_LIBDEPS)' - emit += 'LDADD =%s %s/%s/%s.%s%s\n\n' % \ - (local_ldadd_before, testsbase_inverse, sourcebase, libname, libext, - local_ldadd_after) + emit += 'LDADD = libtests.a %s/%s/%s.%s libtests.a %s/%s/%s.%s $(LIBTESTS_LIBDEPS)\n\n' % \ + (testsbase_inverse, sourcebase, libname, libext, + testsbase_inverse, sourcebase, libname, libext) + else: + emit += 'LDADD = %s/%s/%s.%s\n\n' % \ + (testsbase_inverse, sourcebase, libname, libext) if libtests: emit += 'libtests_a_SOURCES =\n' # Here we use $(LIBOBJS), not @LIBOBJS@. The value is the same. However, |