diff --git a/eng/Subsets.props b/eng/Subsets.props
index 60df5761337097..92cd8b27518189 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -178,7 +178,7 @@
-
+
diff --git a/src/mono/Directory.Build.props b/src/mono/Directory.Build.props
index fed776d063ff34..91362e137887c2 100644
--- a/src/mono/Directory.Build.props
+++ b/src/mono/Directory.Build.props
@@ -99,6 +99,6 @@
$(ArtifactsObjDir)mono/$(PlatformConfigPathPart)/
- $(MonoObjDir)llvm
+ $(MonoObjDir)llvm
diff --git a/src/mono/llvm/llvm-init.proj b/src/mono/llvm/llvm-init.proj
index a43b35b917bc99..e26ac412f9a3fa 100644
--- a/src/mono/llvm/llvm-init.proj
+++ b/src/mono/llvm/llvm-init.proj
@@ -9,8 +9,8 @@
-
-
+
+
@@ -19,8 +19,8 @@
-
-
+
+
diff --git a/src/mono/mono.proj b/src/mono/mono.proj
index b0535f891a6d9f..de48a215b7a38a 100644
--- a/src/mono/mono.proj
+++ b/src/mono/mono.proj
@@ -50,7 +50,7 @@
<_MonoConfigureParams Include="--enable-maintainer-mode" />
<_MonoConfigureParams Include="--enable-compile-warnings" />
<_MonoConfigureParams Include="--prefix=$(MonoObjDir)out" />
- <_MonoConfigureParams Condition="'$(MonoEnableLLVM)' == 'true'" Include="--with-llvm=$(MonoLLVMDir)" />
+ <_MonoConfigureParams Condition="'$(MonoEnableLLVM)' == 'true'" Include="--with-llvm=$(MonoLLVMDir)" />
<_MonoConfigureParams Condition="'$(MonoEnableCXX)' == 'true'" Include="--enable-cxx" />
@@ -183,7 +183,7 @@
<_MonoAotCrossConfigureParams Include="--enable-minimal=com,remoting" />
<_MonoAotCrossConfigureParams Include="--enable-monotouch" />
<_MonoAotCrossConfigureParams Include="--disable-crash-reporting" />
-
+ <_MonoAotCrossConfigureParams Include="--with-llvm=$(MonoLLVMDir)" />
<_MonoAotCrossAC_VARS Include="ac_cv_func_shm_open_working_with_mmap=no" />
@@ -377,7 +377,7 @@
<_MonoAotCrossConfigureParams Include="--enable-minimal=com,remoting" />
<_MonoAotCrossConfigureParams Include="--enable-monotouch" />
<_MonoAotCrossConfigureParams Include="--disable-crash-reporting" />
-
+ <_MonoAotCrossConfigureParams Include="--with-llvm=$(MonoLLVMDir)" />
<_MonoAotCrossAC_VARS Include="ac_cv_func_shm_open_working_with_mmap=no" />
@@ -1039,6 +1039,12 @@
<_MonoRuntimeArtifacts Include="$(_MonoAotCrossFilePath)">
$(BinDir)cross\mono-aot-cross
+ <_MonoRuntimeArtifacts Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'" Include="$(MonoLLVMDir)\bin\llc">
+ $(BinDir)cross\llc
+
+ <_MonoRuntimeArtifacts Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'" Include="$(MonoLLVMDir)\bin\opt">
+ $(BinDir)cross\opt
+
<_MonoIncludeArtifacts Include="$(MonoObjDir)out\include\**" />