Merge pull request #3325 from alexanderkyte/fix_bitcode_mini

[mobile_static] Pass correct MONO_LLVMONLY for bitcode script

diff --git a/Makefile.am b/Makefile.am
index 9c6dc7e971457668dc80b31fa3d5d152d9b3f363..f34ec85883d68bc6cb2a172fbe85ca06890cbb5a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -69,7 +69,7 @@ get-monolite-latest:
 
 .PHONY: check-ci
 check-ci:
-       MONO_LLVMONLY=$(MONO_LLVMONLY) $(srcdir)/scripts/ci/run-test-$(TEST_PROFILE).sh
+       MONO_LLVMONLY=$(BITCODE) $(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 f2ac137b67f46b2067829fdf1f1af9d31a3abd59..0d16b52f785e091d6f448fa7019412b12a36e314 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -892,7 +892,10 @@ AM_CONDITIONAL(INSTALL_MOBILE_STATIC, [test "x$with_mobile_static" != "xno"])
 
 AC_SUBST(INSTALL_MOBILE_STATIC)
 
-AC_SUBST(BITCODE)
+AM_COND_IF(BITCODE, [
+       BITCODE=TRUE
+       AC_SUBST(BITCODE)
+])
 
 default_profile=net_4_x
 if test -z "$INSTALL_MONODROID_TRUE"; then :