diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2018-04-13 07:29:31 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-13 07:29:31 +0300 |
| commit | 5e9af502c052f9c83565b329cd002a2a6c415cdc (patch) | |
| tree | cf6f6c298632af9b1f75a6f2da9a16df2a0c9dc5 /ikvm-native | |
| parent | fbd40546099e676c24760b47a4f0db65d877abc1 (diff) | |
[runtime] Get rid of the GLIB_LIBS autoconf define, it prevents automake from detecting the dependency on libeglib.la. (#8184)
* [runtime] Get rid of the GLIB_LIBS autoconf define, it prevents automake from detecting the dependency on libeglib.la. Fixes #8175.
* [runtime] Link eglib against -lm to avoid duplication.
* [runtime] Remove a few extra -lm options.
* [runtime] More GLIB_LIBS fixes.
Diffstat (limited to 'ikvm-native')
| -rw-r--r-- | ikvm-native/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ikvm-native/Makefile.am b/ikvm-native/Makefile.am index 4f391fe60cb..47b13aa3fc2 100644 --- a/ikvm-native/Makefile.am +++ b/ikvm-native/Makefile.am @@ -1,9 +1,11 @@ AM_CPPFLAGS = $(GLIB_CFLAGS) +glib_libs = $(top_builddir)/mono/eglib/libeglib.la + lib_LTLIBRARIES = libikvm-native.la libikvm_native_la_SOURCES = jni.c os.c jni.h libikvm_native_la_LDFLAGS = -avoid-version -libikvm_native_la_LIBADD = $(GLIB_LIBS) +libikvm_native_la_LIBADD = $(glib_libs) |