diff options
| author | danmosemsft <danmose@microsoft.com> | 2017-02-11 07:20:12 -0800 |
|---|---|---|
| committer | danmosemsft <danmose@microsoft.com> | 2017-02-11 07:20:12 -0800 |
| commit | 56d4ba8a9338c3ff7378d18378f38ad847f130f2 (patch) | |
| tree | 40b9463880286b1bc0b4c3f858680f1ff210c933 /src/ToolBox | |
| parent | 8be2f9bb0039e2c49f59c4fb66cebf5467485ba2 (diff) | |
| download | coreclr-56d4ba8a9338c3ff7378d18378f38ad847f130f2.tar.gz coreclr-56d4ba8a9338c3ff7378d18378f38ad847f130f2.tar.bz2 coreclr-56d4ba8a9338c3ff7378d18378f38ad847f130f2.zip | |
Revert "Remove always defined FEATURE_CORESYSTEM"
This reverts commit 751771a8976f909af772e35c167bd7e3ffbe44c8.
Diffstat (limited to 'src/ToolBox')
| -rw-r--r-- | src/ToolBox/SOS/Strike/util.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ToolBox/SOS/Strike/util.cpp b/src/ToolBox/SOS/Strike/util.cpp index 90574fc6f0..b6336fb143 100644 --- a/src/ToolBox/SOS/Strike/util.cpp +++ b/src/ToolBox/SOS/Strike/util.cpp @@ -4791,7 +4791,13 @@ HRESULT InitCorDebugInterface() // SOS now has a statically linked version of the loader code that is normally found in mscoree/mscoreei.dll // Its not much code and takes a big step towards 0 install dependencies // Need to pick the appropriate SKU of CLR to detect +#if defined(FEATURE_CORESYSTEM) GUID skuId = CLR_ID_ONECORE_CLR; +#elif defined(FEATURE_CORECLR) + GUID skuId = CLR_ID_CORECLR; +#else + GUID skuId = CLR_ID_V4_DESKTOP; +#endif CLRDebuggingImpl* pDebuggingImpl = new CLRDebuggingImpl(skuId); hr = pDebuggingImpl->QueryInterface(IID_ICLRDebugging, (LPVOID *)&pClrDebugging); if (FAILED(hr)) |