summaryrefslogtreecommitdiff
path: root/clr.coreclr.props
diff options
context:
space:
mode:
authorJan Kotas <jkotas@microsoft.com>2016-05-02 11:05:17 -0700
committerJan Kotas <jkotas@microsoft.com>2016-05-02 11:05:17 -0700
commita91aee5ca088e5d80835fc593d72d9cacd5d7480 (patch)
tree6279f1c7af18c4fd5d0561b0db4548be46d03028 /clr.coreclr.props
parent7dd56b48bd99a776e8e7dd3638f59191c5013e9b (diff)
parent8d55cd34e8192ac9679e7f1b34b0b1709154c943 (diff)
downloadcoreclr-a91aee5ca088e5d80835fc593d72d9cacd5d7480.tar.gz
coreclr-a91aee5ca088e5d80835fc593d72d9cacd5d7480.tar.bz2
coreclr-a91aee5ca088e5d80835fc593d72d9cacd5d7480.zip
Merge pull request #4709 from myungjoo/fix/4682
Match Inconsistent CMake/MSBuild Compiler Definitions
Diffstat (limited to 'clr.coreclr.props')
-rw-r--r--clr.coreclr.props2
1 files changed, 1 insertions, 1 deletions
diff --git a/clr.coreclr.props b/clr.coreclr.props
index f7762d2cfa..121968f976 100644
--- a/clr.coreclr.props
+++ b/clr.coreclr.props
@@ -31,7 +31,7 @@
<FeatureMainClrModuleUsesCoreName>true</FeatureMainClrModuleUsesCoreName>
<FeatureMergeCultureSupportAndEngine>true</FeatureMergeCultureSupportAndEngine>
<FeatureMergeJitAndEngine>true</FeatureMergeJitAndEngine>
- <FeatureMulticoreJIT Condition="'$(TargetArch)'!='arm'">true</FeatureMulticoreJIT>
+ <FeatureMulticoreJIT>true</FeatureMulticoreJIT>
<FeatureNormIdnaOnly>true</FeatureNormIdnaOnly>
<FeaturePrejit>true</FeaturePrejit>
<FeatureStandaloneSn>true</FeatureStandaloneSn>