|
36 | 36 | <PropertyGroup> |
37 | 37 | <_MonoSdksConfiguration Condition=" '$(Configuration)' == 'Release' ">release</_MonoSdksConfiguration> |
38 | 38 | <_MonoSdksConfiguration Condition=" '$(Configuration)' != 'Release' ">debug</_MonoSdksConfiguration> |
| 39 | + |
| 40 | + <_MonoSdksAndroidToolchainPrefix>$([System.IO.Path]::GetFullPath ('$(AndroidToolchainDirectory)\toolchains'))</_MonoSdksAndroidToolchainPrefix> |
| 41 | + <_MonoSdksLlvmSrc>$([System.IO.Path]::GetFullPath ('$(MSBuildThisFileDirectory)..\..\external\llvm'))</_MonoSdksLlvmSrc> |
| 42 | + <_MonoSdksMxePrefix>$(AndroidMxeFullPath)</_MonoSdksMxePrefix> |
| 43 | + <_MonoSdksMxeSrc>$([System.IO.Path]::GetFullPath ('$(MSBuildThisFileDirectory)..\..\external\mxe'))</_MonoSdksMxeSrc> |
| 44 | + |
| 45 | + <_MonoSdksParameters>CONFIGURATION=$(_MonoSdksConfiguration) IGNORE_PACKAGE_MXE=true IGNORE_PACKAGE_LLVM=true ANDROID_TOOLCHAIN_PREFIX="$(_MonoSdksAndroidToolchainPrefix)" LLVM_SRC="$(_MonoSdksLlvmSrc)" MXE_PREFIX="$(_MonoSdksMxePrefix)" MXE_SRC="$(_MonoSdksMxeSrc)"</_MonoSdksParameters> |
39 | 46 | </PropertyGroup> |
40 | 47 | <PropertyGroup> |
41 | 48 | <ForceBuildDependsOn> |
|
199 | 206 | Condition=" '$(_LlvmNeeded)' != '' "> |
200 | 207 | <Exec |
201 | 208 | Condition=" '%(_LlvmRuntime.UseMonoSdks)' != 'False' " |
202 | | - Command="make $(MakeConcurrency) package-llvm-%(_LlvmRuntime.Identity) CONFIGURATION=$(_MonoSdksConfiguration)" |
| 209 | + Command="make $(MakeConcurrency) package-llvm-%(_LlvmRuntime.Identity) $(_MonoSdksParameters)" |
203 | 210 | IgnoreStandardErrorWarningFormat="True" |
204 | 211 | WorkingDirectory="$(MonoSourceFullPath)\sdks\builds" |
205 | 212 | /> |
|
441 | 448 | Outputs="@(_RuntimeSource);@(_MonoBinarySource);@(_ProfilerSource);@(_MonoPosixHelperSource);@(_RuntimeEglibHeaderSource);@(_MonoBtlsSource);@(_BclTestOutput)"> |
442 | 449 | <Exec |
443 | 450 | Condition=" '%(_MonoRuntime.UseMonoSdks)' != 'False' And '%(_MonoRuntime.DoBuild)' == 'true' " |
444 | | - Command="make $(MakeConcurrency) package-android-%(_MonoRuntime.Identity) CONFIGURATION=$(_MonoSdksConfiguration) ANDROID_TOOLCHAIN_PREFIX="$(AndroidToolchainDirectory)\toolchains"" |
| 451 | + Command="make $(MakeConcurrency) package-android-%(_MonoRuntime.Identity) $(_MonoSdksParameters)" |
445 | 452 | IgnoreStandardErrorWarningFormat="True" |
446 | 453 | WorkingDirectory="$(MonoSourceFullPath)\sdks\builds" |
447 | 454 | /> |
|
881 | 888 | AfterTargets="Clean"> |
882 | 889 | <Exec |
883 | 890 | Condition=" '%(_MonoRuntime.UseMonoSdks)' != 'False' " |
884 | | - Command="make $(MakeConcurrency) clean-android-%(_MonoRuntime.Identity) CONFIGURATION=$(_MonoSdksConfiguration)" |
| 891 | + Command="make $(MakeConcurrency) clean-android-%(_MonoRuntime.Identity) $(_MonoSdksParameters)" |
885 | 892 | IgnoreStandardErrorWarningFormat="True" |
886 | 893 | WorkingDirectory="$(MonoSourceFullPath)\sdks\builds" |
887 | 894 | /> |
888 | 895 | <Exec |
889 | 896 | Condition=" '%(_LlvmRuntime.UseMonoSdks)' != 'False' " |
890 | | - Command="make $(MakeConcurrency) clean-llvm-%(_LlvmRuntime.Identity) CONFIGURATION=$(_MonoSdksConfiguration)" |
| 897 | + Command="make $(MakeConcurrency) clean-llvm-%(_LlvmRuntime.Identity) $(_MonoSdksParameters)" |
891 | 898 | IgnoreStandardErrorWarningFormat="True" |
892 | 899 | WorkingDirectory="$(MonoSourceFullPath)\sdks\builds" |
893 | 900 | /> |
|
0 commit comments