diff options
| author | Russ Keldorph <Russ.Keldorph@microsoft.com> | 2018-03-17 11:37:41 +0000 |
|---|---|---|
| committer | Russ Keldorph <Russ.Keldorph@microsoft.com> | 2018-03-17 11:37:41 +0000 |
| commit | a10ed8021d0cf7e11447c3a498e360ced4f960be (patch) | |
| tree | e2ca6efdb28ec05f91acdb8b5e15d16ec5ec41e9 /dir.props | |
| parent | cd8af80c29379c69997106d1d347a2b4ab02693b (diff) | |
| parent | cea438a8e885cc11f96671367bebf23137f45a5a (diff) | |
| download | coreclr-a10ed8021d0cf7e11447c3a498e360ced4f960be.tar.gz coreclr-a10ed8021d0cf7e11447c3a498e360ced4f960be.tar.bz2 coreclr-a10ed8021d0cf7e11447c3a498e360ced4f960be.zip | |
Merge commit 'cea438a8e885cc11f96671367bebf23137f45a5a' into release/2.1
Diffstat (limited to 'dir.props')
| -rw-r--r-- | dir.props | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -168,6 +168,7 @@ <!-- Define packaging attributes for cross target components --> <HasCrossTargetComponents Condition="'$(TargetsWindows)' == 'true' and ('$(PackagePlatform)' =='arm64' or '$(PackagePlatform)' =='arm')">true</HasCrossTargetComponents> + <HasCrossTargetComponents Condition="'$(TargetsLinux)' == 'true' and '$(PackagePlatform)' =='arm' and '$(__DoCrossArchBuild)' == '1'">true</HasCrossTargetComponents> <CrossTargetComponentFolder Condition="'$(PackagePlatform)' == 'arm64'">x64</CrossTargetComponentFolder> <CrossTargetComponentFolder Condition="'$(PackagePlatform)' == 'arm'">x86</CrossTargetComponentFolder> |