[runtime] Accomplish BITCODE build symbol sharing with only make (#3329)

diff --git a/Makefile.am b/Makefile.am
index f34ec85883d68bc6cb2a172fbe85ca06890cbb5a..aaffb9842ba9dbe36090cead00afe0d1ebe1232d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,9 +67,13 @@ get-monolite-latest:
        cd $(mcslib) && { (wget -O- $(monolite_url) || curl $(monolite_url)) | gzip -d | tar xf - ; }
        cd $(mcslib) && mv -f monolite-* monolite
 
+if BITCODE
+BITCODE_CHECK=yes
+endif
+
 .PHONY: check-ci
 check-ci:
-       MONO_LLVMONLY=$(BITCODE) $(srcdir)/scripts/ci/run-test-$(TEST_PROFILE).sh
+       MONO_LLVMONLY=$(BITCODE_CHECK) $(srcdir)/scripts/ci/run-test-$(TEST_PROFILE).sh
 
 .PHONY: validate do-build-mono-mcs mcs-do-clean mcs-do-tests
 validate: do-build-mono-mcs

diff --git a/configure.ac b/configure.ac
index 27234cf592d5bc82f847cd72aee9fc366b24d280..b4ac2f5f28b3e79174cd26fd626ab7a0b63d89ba 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -892,11 +892,6 @@ AM_CONDITIONAL(INSTALL_MOBILE_STATIC, [test "x$with_mobile_static" != "xno"])
 
 AC_SUBST(INSTALL_MOBILE_STATIC)
 
-AM_COND_IF(BITCODE, [
-       BITCODE=TRUE
-       AC_SUBST(BITCODE)
-])
-
 default_profile=net_4_x
 if test -z "$INSTALL_MONODROID_TRUE"; then :
    default_profile=monodroid