diff options
| author | Russ Keldorph <Russ.Keldorph@microsoft.com> | 2018-04-16 10:24:20 -0700 |
|---|---|---|
| committer | Russ Keldorph <Russ.Keldorph@microsoft.com> | 2018-04-16 10:24:20 -0700 |
| commit | aec93559245d3e4498397e214c8214ebe789088c (patch) | |
| tree | 94a404d56d5b33a2775db0b442278a9fc89d39d7 /dir.props | |
| parent | b3dff4d441013cbfa39ce209f45ba96d605d8e77 (diff) | |
| parent | 91ce6edff7b897f1356ba43af7b26565639fb6fc (diff) | |
| download | coreclr-aec93559245d3e4498397e214c8214ebe789088c.tar.gz coreclr-aec93559245d3e4498397e214c8214ebe789088c.tar.bz2 coreclr-aec93559245d3e4498397e214c8214ebe789088c.zip | |
Merge commit 'master' into release/2.1
Diffstat (limited to 'dir.props')
| -rw-r--r-- | dir.props | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -168,7 +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> + <HasCrossTargetComponents Condition="'$(TargetsLinux)' == 'true' and ('$(PackagePlatform)' =='arm64' or '$(PackagePlatform)' =='arm') and '$(__DoCrossArchBuild)' == '1'">true</HasCrossTargetComponents> <CrossTargetComponentFolder Condition="'$(PackagePlatform)' == 'arm64'">x64</CrossTargetComponentFolder> <CrossTargetComponentFolder Condition="'$(PackagePlatform)' == 'arm'">x86</CrossTargetComponentFolder> |