summaryrefslogtreecommitdiff
path: root/dir.props
diff options
context:
space:
mode:
authorGaurav Khanna <gkhanna@microsoft.com>2016-08-22 09:45:43 -0700
committerGaurav Khanna <gkhanna@microsoft.com>2016-08-23 22:54:56 -0700
commitad7c799eb9a2ae1e7371c75655d4b244e196b239 (patch)
treec2277470b41fce032020eab4a85dbcda5ad82fdc /dir.props
parentd7821eb792915fa64ff6219c7ce4b9abc195ab7e (diff)
downloadcoreclr-ad7c799eb9a2ae1e7371c75655d4b244e196b239.tar.gz
coreclr-ad7c799eb9a2ae1e7371c75655d4b244e196b239.tar.bz2
coreclr-ad7c799eb9a2ae1e7371c75655d4b244e196b239.zip
Initial commit to build Win32 Arm CoreCLR
Diffstat (limited to 'dir.props')
-rw-r--r--dir.props5
1 files changed, 3 insertions, 2 deletions
diff --git a/dir.props b/dir.props
index e5cac55a8f..cf42c794e1 100644
--- a/dir.props
+++ b/dir.props
@@ -164,9 +164,10 @@
<MinOSForArch Condition="'$(PackagePlatform)' == 'arm'">win8</MinOSForArch>
<MinOSForArch Condition="'$(PackagePlatform)' == 'arm64'">win10</MinOSForArch>
- <!-- Arm64 cross target components are x64 hosted -->
- <HasCrossTargetComponents Condition="'$(PackagePlatform)' =='arm64'">true</HasCrossTargetComponents>
+ <!-- Define packaging attributes for cross target components -->
+ <HasCrossTargetComponents Condition="'$(TargetsWindows)' == 'true' and ('$(PackagePlatform)' =='arm64' or '$(PackagePlatform)' =='arm')">true</HasCrossTargetComponents>
<CrossTargetComponentFolder Condition="'$(PackagePlatform)' == 'arm64'">x64</CrossTargetComponentFolder>
+ <CrossTargetComponentFolder Condition="'$(PackagePlatform)' == 'arm'">x86</CrossTargetComponentFolder>
<PackageOutputPath>$(PackagesBinDir)/pkg/</PackageOutputPath>
<SymbolPackageOutputPath>$(PackagesBinDir)/symbolpkg/</SymbolPackageOutputPath>