summaryrefslogtreecommitdiff
path: root/src/inc
diff options
context:
space:
mode:
authorGaurav Khanna <gkhanna@microsoft.com>2016-04-29 08:00:17 -0700
committerGaurav Khanna <gkhanna@microsoft.com>2016-05-02 08:55:22 -0700
commit9dc862d0b7fbb31c150501f6d11dfe81bbfa673c (patch)
treed5974cec9f217d34a369161045eac351fe4c4052 /src/inc
parente18a26aabee632497cbf4be6258c3c930d004824 (diff)
downloadcoreclr-9dc862d0b7fbb31c150501f6d11dfe81bbfa673c.tar.gz
coreclr-9dc862d0b7fbb31c150501f6d11dfe81bbfa673c.tar.bz2
coreclr-9dc862d0b7fbb31c150501f6d11dfe81bbfa673c.zip
Enable crossgen to load JIT from a custom location
Continue to link the JIT in for Windows Arm64 builds until 4717 is fixed.
Diffstat (limited to 'src/inc')
-rw-r--r--src/inc/zapper.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/inc/zapper.h b/src/inc/zapper.h
index 1ff429effb..0f92e85e0e 100644
--- a/src/inc/zapper.h
+++ b/src/inc/zapper.h
@@ -124,6 +124,9 @@ class Zapper
SString m_platformWinmdPaths;
#endif // FEATURE_CORECLR || CROSSGEN_COMPILE
+#if defined(FEATURE_CORECLR) && !defined(FEATURE_MERGE_JIT_AND_ENGINE)
+ SString m_CLRJITPath;
+#endif // defined(FEATURE_CORECLR) && !defined(FEATURE_MERGE_JIT_AND_ENGINE)
bool m_fForceFullTrust;
SString m_outputFilename;
@@ -445,6 +448,10 @@ class Zapper
void SetForceFullTrust(bool val);
#endif // FEATURE_CORECLR || CROSSGEN_COMPILE
+#if defined(FEATURE_CORECLR) && !defined(FEATURE_MERGE_JIT_AND_ENGINE)
+ void SetCLRJITPath(LPCWSTR pwszCLRJITPath);
+#endif // defined(FEATURE_CORECLR) && !defined(FEATURE_MERGE_JIT_AND_ENGINE)
+
void SetOutputFilename(LPCWSTR pwszOutputFilename);
SString GetOutputFileName();