diff options
| author | stephentoub <stoub@microsoft.com> | 2015-07-15 22:14:57 -0400 |
|---|---|---|
| committer | stephentoub <stoub@microsoft.com> | 2015-07-15 22:14:57 -0400 |
| commit | 82492f7fe7d91331508cb1bf9b33e2e9725d9898 (patch) | |
| tree | 32d6f10b5293a581429aa26bc3a5763155ab3e7d /clr.coreclr.props | |
| parent | 9a68dd604333729f08f85311ddab872423255a67 (diff) | |
| download | coreclr-82492f7fe7d91331508cb1bf9b33e2e9725d9898.tar.gz coreclr-82492f7fe7d91331508cb1bf9b33e2e9725d9898.tar.bz2 coreclr-82492f7fe7d91331508cb1bf9b33e2e9725d9898.zip | |
Ensure FEATURE_MANAGED_ETW isn't set for TargetsUnix
Updated buildtools were brought in to coreclr, and the props file was
still using the $(OS) variable to control whether FEATURE_MANAGED_ETW was
set, but whereas that used to be used to mean what platform we were
targeting, updated buildtools use it to mean what platform we're building
on, with $(OSGroup) meaning what is the target platform.
Diffstat (limited to 'clr.coreclr.props')
| -rw-r--r-- | clr.coreclr.props | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clr.coreclr.props b/clr.coreclr.props index dab09b8564..b47de7b48f 100644 --- a/clr.coreclr.props +++ b/clr.coreclr.props @@ -79,7 +79,7 @@ <!-- The rejit feature is available only on supported architectures (x86 & x64) --> <FeatureReJIT Condition="('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'amd64')">true</FeatureReJIT> <FeatureWindowsPhone>true</FeatureWindowsPhone> - <FeatureManagedEtw Condition="'$(OS)' == 'Windows_NT'">true</FeatureManagedEtw> + <FeatureManagedEtw>true</FeatureManagedEtw> <FeatureManagedEtwChannels>true</FeatureManagedEtwChannels> <FeatureHostedBinder>true</FeatureHostedBinder> <BinderDebugLog Condition="'$(_BuildType)'=='dbg'">true</BinderDebugLog> @@ -112,6 +112,7 @@ <FeatureCominterop>false</FeatureCominterop> <FeatureCominteropUnmanagedActivation>false</FeatureCominteropUnmanagedActivation> <FeatureCominteropWinRTManagedActivation>false</FeatureCominteropWinRTManagedActivation> + <FeatureManagedEtw>false</FeatureManagedEtw> <!-- Features implemented by fxcore --> <FeatureLegacySurface>false</FeatureLegacySurface> |