diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-08-09 21:04:55 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-08-09 21:06:37 +0300 |
| commit | 9d84dcb2fc35af1d75450045a8212bf5ab3ff383 (patch) | |
| tree | a4e31cdb01a87f043ef2dbeeb71e199c8faa034a /tools | |
| parent | f3d3e2beaeff29def5ff9dc940de4ab10c815ef8 (diff) | |
Revert "[runtime] Avoid building a separate static library, use the shared object files for the static library as well. (#5233)"
This reverts commit 56a1881bff83365978e7eb30d18da8809b56c1e2.
It caused a consistent test error on ARM64:
https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-8-arm64/2810/testReport/regression-tests/dummy/MonoTests_regressions_100percentsuccess/
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/monograph/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/pedump/Makefile.am | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/monograph/Makefile.am b/tools/monograph/Makefile.am index 13976c5a85b..1a53e3772b7 100644 --- a/tools/monograph/Makefile.am +++ b/tools/monograph/Makefile.am @@ -7,7 +7,7 @@ if DISABLE_EXECUTABLES runtime_lib=$(top_builddir)/mono/mini/$(LIBMONO_LA) $(static_libs) else static_libs= \ - $(top_builddir)/mono/metadata/libmonoruntimesgen.la \ + $(top_builddir)/mono/metadata/libmonoruntimesgen-static.la \ $(top_builddir)/mono/utils/libmonoutils.la \ $(GLIB_LIBS) $(LIBICONV) \ $(LIBGC_STATIC_LIBS) diff --git a/tools/pedump/Makefile.am b/tools/pedump/Makefile.am index 30d8afd431e..4fb8260abdb 100644 --- a/tools/pedump/Makefile.am +++ b/tools/pedump/Makefile.am @@ -17,8 +17,8 @@ pedump_SOURCES = \ pedump.c pedump_LDADD = \ - $(top_builddir)/mono/metadata/libmonoruntimesgen.la \ - $(top_builddir)/mono/sgen/libmonosgen.la \ + $(top_builddir)/mono/metadata/libmonoruntimesgen-static.la \ + $(top_builddir)/mono/sgen/libmonosgen-static.la \ $(top_builddir)/mono/utils/libmonoutils.la \ $(LLVM_LIBS) \ $(LLVM_LDFLAGS) \ |