diff options
author | Aleksey Kliger (λgeek) <akliger@gmail.com> | 2018-03-27 17:57:23 +0300 |
---|---|---|
committer | Ludovic Henry <luhenry@microsoft.com> | 2018-03-27 17:57:23 +0300 |
commit | dc1ef2ea3a2583f985100bcbfc45489789004bce (patch) | |
tree | 25164ac303ed010f593878b93a5d50ed20a02613 /msvc | |
parent | 32e6bccc2d1c6c9851efa7ad03fa57279e22bdca (diff) |
[runtime] One more MonoClass getter fixup (#7836)
* [monograph] Don't link duplicate copies of metadata and utils
Monograph builds against mono/mini/($LIBMONO_LA) (aka libmonosgen-2.0.la), so
the only pieces it would pick up from staticlly linking the extra libs are
non-API functions (such as the MonoClass getters), but at the cost of linking
errors due to duplicate symbols.
Also replace calls to MonoClass getters by mono API functions.
* [ilgen] Fixup MonoClass getter usage
Followup for e610e443cd67c78c2aeabef4209e380226dd65d5
* [boehm] Fix a few direct MonoClass accesses
* [monograph] Statically link against the mono runtime
Dynamically linking but using some symbols (such as mono_read32) on some
platforms that are hidden in the library means that we had to statically link
against the runtime anyway, which then caused build issues.
* [monograph] Fix runtime crash on startup
```
mono_os_mutex_lock: pthread_mutex_lock failed with "Invalid argument" (22)
```
* [msvc] Fix monograph build
Diffstat (limited to 'msvc')
-rw-r--r-- | msvc/monograph.vcxproj | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/msvc/monograph.vcxproj b/msvc/monograph.vcxproj index 022665893f8..29ca2e961b7 100644 --- a/msvc/monograph.vcxproj +++ b/msvc/monograph.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -105,7 +105,7 @@ <LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem>
<DataExecutionPrevention>
@@ -130,7 +130,7 @@ <SubSystem>Console</SubSystem>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <AdditionalDependencies>$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -151,7 +151,7 @@ <LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem>
</Link>
@@ -175,7 +175,7 @@ <Link>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem>
- <AdditionalDependencies>$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -183,14 +183,11 @@ <ClCompile Include="..\tools\monograph\monograph.c" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="eglib.vcxproj">
- <Project>{158073ed-99ae-4196-9edc-ddb2344f8466}</Project>
- </ProjectReference>
- <ProjectReference Include="libmono-dynamic.vcxproj">
- <Project>{675f4175-ffb1-480d-ad36-f397578844d4}</Project>
+ <ProjectReference Include="libmono-static.vcxproj">
+ <Project>{cb0d9e92-293c-439c-9ac7-c5f59b6e0772}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file +</Project>
|