diff options
| author | Eugene Zemtsov <Eugene.Zemtsov@microsoft.com> | 2015-02-05 14:19:32 -0800 |
|---|---|---|
| committer | Eugene Zemtsov <Eugene.Zemtsov@microsoft.com> | 2015-02-05 14:19:32 -0800 |
| commit | f7a3a79aa7960b0046cd59517a44ae83d0c95e0a (patch) | |
| tree | 37b2c4a3329ec13f344cda4602489721b13cd08b /src/md | |
| parent | a71f0715019300102e9b688e682f8781068f3265 (diff) | |
| download | coreclr-f7a3a79aa7960b0046cd59517a44ae83d0c95e0a.tar.gz coreclr-f7a3a79aa7960b0046cd59517a44ae83d0c95e0a.tar.bz2 coreclr-f7a3a79aa7960b0046cd59517a44ae83d0c95e0a.zip | |
Make DBI build on Linux
- Compile DBI on Linux.
- Link DBI on Linux to the point when only symbols related to INativePipeline are missing.
In order to completely link DBI we'll have to do some development, and it will be addressed by a separate change.
[tfs-changeset: 1411066]
Diffstat (limited to 'src/md')
| -rw-r--r-- | src/md/compiler/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/md/enc/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/md/enc/liteweightstgdbrw.cpp | 6 | ||||
| -rw-r--r-- | src/md/md_dbi.cmake | 15 | ||||
| -rw-r--r-- | src/md/runtime/CMakeLists.txt | 4 |
5 files changed, 16 insertions, 17 deletions
diff --git a/src/md/compiler/CMakeLists.txt b/src/md/compiler/CMakeLists.txt index 397cb90b7a..c2d84f3766 100644 --- a/src/md/compiler/CMakeLists.txt +++ b/src/md/compiler/CMakeLists.txt @@ -30,6 +30,4 @@ endif(CLR_CMAKE_PLATFORM_UNIX) add_subdirectory(dac) add_subdirectory(wks) -if(WIN32) - add_subdirectory(dbi) -endif(WIN32) +add_subdirectory(dbi) diff --git a/src/md/enc/CMakeLists.txt b/src/md/enc/CMakeLists.txt index 0c34b7bbc5..5eda2db690 100644 --- a/src/md/enc/CMakeLists.txt +++ b/src/md/enc/CMakeLists.txt @@ -20,6 +20,4 @@ endif(CLR_CMAKE_PLATFORM_UNIX) add_subdirectory(dac) add_subdirectory(wks) -if(WIN32) - add_subdirectory(dbi) -endif(WIN32)
\ No newline at end of file +add_subdirectory(dbi) diff --git a/src/md/enc/liteweightstgdbrw.cpp b/src/md/enc/liteweightstgdbrw.cpp index 9e75ae7635..d5063f53c8 100644 --- a/src/md/enc/liteweightstgdbrw.cpp +++ b/src/md/enc/liteweightstgdbrw.cpp @@ -1127,14 +1127,16 @@ CLiteWeightStgdbRW::GetRawStreamInfo( STORAGEHEADER sHdr; // Header for the storage. PSTORAGESTREAM pStream; // Pointer to each stream. ULONG i; // Loop control. + void *pData; + ULONG cbData; #ifdef FEATURE_METADATA_CUSTOM_DATA_SOURCE if (m_pStgIO == NULL) IfFailGo(COR_E_NOTSUPPORTED); #endif - void *pData = m_pStgIO->m_pData; - ULONG cbData = m_pStgIO->m_cbData; + pData = m_pStgIO->m_pData; + cbData = m_pStgIO->m_cbData; // Validate the signature of the format, or it isn't ours. IfFailGo(MDFormat::VerifySignature((PSTORAGESIGNATURE) pData, cbData)); diff --git a/src/md/md_dbi.cmake b/src/md/md_dbi.cmake index 8d78cdfc71..6e7166b2fc 100644 --- a/src/md/md_dbi.cmake +++ b/src/md/md_dbi.cmake @@ -6,9 +6,12 @@ add_definitions(-DFEATURE_METADATA_DEBUGGEE_DATA_SOURCE) # Enable mscordbi-only (perf) feature --> add_definitions(-DFEATURE_METADATA_LOAD_TRUSTED_IMAGES -DFEATURE_METADATA_RELEASE_MEMORY_ON_REOPEN) -# using static crt for dbi -if (CMAKE_BUILD_TYPE STREQUAL DEBUG) - add_definitions(-MTd) -else(CMAKE_BUILD_TYPE STREQUAL DEBUG) - add_definitions(-MT) -endif(CMAKE_BUILD_TYPE STREQUAL DEBUG) + +if(WIN32) + # using static crt for dbi + if (CMAKE_BUILD_TYPE STREQUAL DEBUG) + add_definitions(-MTd) + else(CMAKE_BUILD_TYPE STREQUAL DEBUG) + add_definitions(-MT) + endif(CMAKE_BUILD_TYPE STREQUAL DEBUG) +endif(WIN32)
\ No newline at end of file diff --git a/src/md/runtime/CMakeLists.txt b/src/md/runtime/CMakeLists.txt index aa85611215..ed938707ef 100644 --- a/src/md/runtime/CMakeLists.txt +++ b/src/md/runtime/CMakeLists.txt @@ -19,6 +19,4 @@ endif(CLR_CMAKE_PLATFORM_UNIX) add_subdirectory(dac) add_subdirectory(wks) -if(WIN32) - add_subdirectory(dbi) -endif(WIN32)
\ No newline at end of file +add_subdirectory(dbi) |