diff options
| author | Bernhard Urban <lewurm@gmail.com> | 2018-01-25 16:11:06 +0300 |
|---|---|---|
| committer | Bernhard Urban <bernhard.urban@xamarin.com> | 2018-01-29 12:41:36 +0300 |
| commit | 0acf7ff606e37d13fd278a172c10aed5a7824ae7 (patch) | |
| tree | f9103d0053b63957e47d6eebec92701381e4f99f | |
| parent | 65389bd4f2c89fdc83b2b852d3c1ae9da75018d4 (diff) | |
[interp] use libmonoldflags (to enforce -no-undefined)
it has the right logic to avoid this:
```
ld: -undefined and -bitcode_bundle (Xcode setting ENABLE_BITCODE=YES) cannot be used together
```
i.e. setting `-no-undefined`. However, this requires that we link
against `libmonosgen` on those platforms.
| -rwxr-xr-x | mono/mini/Makefile.am.in | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mono/mini/Makefile.am.in b/mono/mini/Makefile.am.in index 223f26dafea..324254dc02f 100755 --- a/mono/mini/Makefile.am.in +++ b/mono/mini/Makefile.am.in @@ -648,6 +648,10 @@ endif libmono_ee_interp_la_SOURCES = $(interp_sources) libmono_ee_interp_la_CFLAGS = $(mono_CFLAGS) +libmono_ee_interp_la_LDFLAGS = $(libmonoldflags) +if BITCODE +libmono_ee_interp_la_LIBADD = libmonosgen-2.0.la +endif libmini_la_SOURCES = $(common_sources) $(llvm_sources) $(llvm_runtime_sources) $(arch_sources) $(os_sources) libmini_la_CFLAGS = $(mono_CFLAGS) @@ -668,12 +672,15 @@ libmonosgen_2_0_la_LDFLAGS = $(libmonoldflags) $(monobin_platform_ldflags) # libmini_static_la_SOURCES = $(libmini_la_SOURCES) libmini_static_la_CFLAGS = $(AM_CFLAGS) -libmini_static_la_LDFLAGS = -static +libmini_static_la_LDFLAGS = $(libmonoldflags) -static libmini_static_la_LIBADD = $(MONO_DTRACE_OBJECT) libmono_ee_interp_static_la_SOURCES = $(libmono_ee_interp_la_SOURCES) libmono_ee_interp_static_la_CFLAGS = $(AM_CFLAGS) libmono_ee_interp_static_la_LDFLAGS = -static +if BITCODE +libmono_ee_interp_static_la_LIBADD = libmonosgen-2.0.la +endif libmonoincludedir = $(includedir)/mono-$(API_VER)/mono/jit |