summaryrefslogtreecommitdiff
path: root/dir.props
diff options
context:
space:
mode:
authorEgor Chesakov <Egor.Chesakov@microsoft.com>2018-03-14 16:46:44 -0700
committerGitHub <noreply@github.com>2018-03-14 16:46:44 -0700
commitffc16020fee4d866de568042fe085143332a2159 (patch)
tree22d8c9232372987568ad1db133e80c58b7adbab0 /dir.props
parent01fe8b7e9e04fdccf485f6c0399ee91dcb881c72 (diff)
downloadcoreclr-ffc16020fee4d866de568042fe085143332a2159.tar.gz
coreclr-ffc16020fee4d866de568042fe085143332a2159.tar.bz2
coreclr-ffc16020fee4d866de568042fe085143332a2159.zip
Include Linux/cross-arch components into NuGet packages (#16859)
* Add __DoCrossArchBuild settings to config.json * HasCrossTargetComponents computes to 'true' on Linux when __DoCrossArchBuild is 1 in dir.props * Include cross-architecture libclrjit.so crossgen into NuGet props files when HasCrossTargetComponents is 'true' * Pass $__DoCrossArchBuild to run.sh when generating NuGet packages in build.sh
Diffstat (limited to 'dir.props')
-rw-r--r--dir.props1
1 files changed, 1 insertions, 0 deletions
diff --git a/dir.props b/dir.props
index a5623ab361..ff301845c6 100644
--- a/dir.props
+++ b/dir.props
@@ -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>