Skip to content

Commit 436a869

Browse files
committed
Only link bdwgc related libraries when targeting bdwgc
1 parent 231cb9d commit 436a869

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

msvc/libmono-dynamic.vcxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@
122122
<Link>
123123
<AdditionalDependencies Condition="'$(MONO_TARGET_GC)'!='sgen'">$(GC_LIB);%(AdditionalDependencies)</AdditionalDependencies>
124124
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
125-
<AdditionalOptions>/WHOLEARCHIVE:libgcbdwgc.lib</AdditionalOptions>
126-
<ModuleDefinitionFile>libmono-dynamic.def</ModuleDefinitionFile>
125+
<AdditionalOptions Condition="'$(MONO_TARGET_GC)'=='bdwgc'">/WHOLEARCHIVE:libgcbdwgc.lib</AdditionalOptions>
126+
<ModuleDefinitionFile Condition="'$(MONO_TARGET_GC)'=='bdwgc'">libmono-dynamic.def</ModuleDefinitionFile>
127127
<DataExecutionPrevention>
128128
</DataExecutionPrevention>
129129
<ImportLibrary>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
@@ -162,8 +162,8 @@
162162
<Link>
163163
<AdditionalDependencies Condition="'$(MONO_TARGET_GC)'!='sgen'">$(GC_LIB);%(AdditionalDependencies)</AdditionalDependencies>
164164
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
165-
<AdditionalOptions>/WHOLEARCHIVE:libgcbdwgc.lib</AdditionalOptions>
166-
<ModuleDefinitionFile>libmono-dynamic.def</ModuleDefinitionFile>
165+
<AdditionalOptions Condition="'$(MONO_TARGET_GC)'=='bdwgc'">/WHOLEARCHIVE:libgcbdwgc.lib</AdditionalOptions>
166+
<ModuleDefinitionFile Condition="'$(MONO_TARGET_GC)'=='bdwgc'">libmono-dynamic.def</ModuleDefinitionFile>
167167
<ImportLibrary>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
168168
</Link>
169169
<PostBuildEvent>
@@ -194,8 +194,8 @@
194194
<Link>
195195
<AdditionalDependencies Condition="'$(MONO_TARGET_GC)'!='sgen'">$(GC_LIB);%(AdditionalDependencies)</AdditionalDependencies>
196196
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
197-
<AdditionalOptions>/WHOLEARCHIVE:libgcbdwgc.lib</AdditionalOptions>
198-
<ModuleDefinitionFile>libmono-dynamic.def</ModuleDefinitionFile>
197+
<AdditionalOptions Condition="'$(MONO_TARGET_GC)'=='bdwgc'">/WHOLEARCHIVE:libgcbdwgc.lib</AdditionalOptions>
198+
<ModuleDefinitionFile Condition="'$(MONO_TARGET_GC)'=='bdwgc'">libmono-dynamic.def</ModuleDefinitionFile>
199199
<DataExecutionPrevention>
200200
</DataExecutionPrevention>
201201
<ImportLibrary>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
@@ -234,8 +234,8 @@
234234
<Link>
235235
<AdditionalDependencies Condition="'$(MONO_TARGET_GC)'!='sgen'">$(GC_LIB);%(AdditionalDependencies)</AdditionalDependencies>
236236
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
237-
<AdditionalOptions>/WHOLEARCHIVE:libgcbdwgc.lib</AdditionalOptions>
238-
<ModuleDefinitionFile>libmono-dynamic.def</ModuleDefinitionFile>
237+
<AdditionalOptions Condition="'$(MONO_TARGET_GC)'=='bdwgc'">/WHOLEARCHIVE:libgcbdwgc.lib</AdditionalOptions>
238+
<ModuleDefinitionFile Condition="'$(MONO_TARGET_GC)'=='bdwgc'">libmono-dynamic.def</ModuleDefinitionFile>
239239
<ImportLibrary>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
240240
</Link>
241241
<PostBuildEvent>

0 commit comments

Comments
 (0)