Skip to content

Commit c2a9637

Browse files
committed
Specify suffix as bdwgc as Unity expects this.
We previusly built a distinct version of Mono with our newer Boehm GC. To avoid conflicting with Mono we renamed it bdwgc. Now that we have upstreamed the boehm support in Mono to use our GC fork, we just build the Mono Boehm target. However, Unity is still expecting libraries with a -bdwgc suffix. Build the library with the expected suffix on Windows rather than renaming to avoid issues with symbols.
1 parent 1dd091b commit c2a9637

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

external/buildscripts/build_win_no_cygwin.pl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
my $archNameForBuild = $arch32 ? 'Win32' : 'x64';
127127
my $configDirName = $debug ? "Debug" : "Release";
128128
129-
copy("$monoroot/msvc/build/boehm/$archNameForBuild/bin/$configDirName/mono-boehm.exe", "$monoprefix/bin/mono-bdwgc.exe") or die ("failed copying mono-bdwgc.exe\n");
130-
copy("$monoroot/msvc/build/boehm/$archNameForBuild/bin/$configDirName/mono-2.0-boehm.dll", "$monoprefix/bin/mono-2.0-bdwgc.dll") or die ("failed copying mono-2.0-bdwgc.dll\n");
131-
copy("$monoroot/msvc/build/boehm/$archNameForBuild/bin/$configDirName/mono-2.0-boehm.pdb", "$monoprefix/bin/mono-2.0-bdwgc.pdb") or die ("failed copying mono-2.0-bdwgc.pdb\n");
129+
copy("$monoroot/msvc/build/boehm/$archNameForBuild/bin/$configDirName/mono-bdwgc.exe", "$monoprefix/bin/mono-bdwgc.exe") or die ("failed copying mono-bdwgc.exe\n");
130+
copy("$monoroot/msvc/build/boehm/$archNameForBuild/bin/$configDirName/mono-2.0-bdwgc.dll", "$monoprefix/bin/mono-2.0-bdwgc.dll") or die ("failed copying mono-2.0-bdwgc.dll\n");
131+
copy("$monoroot/msvc/build/boehm/$archNameForBuild/bin/$configDirName/mono-2.0-bdwgc.pdb", "$monoprefix/bin/mono-2.0-bdwgc.pdb") or die ("failed copying mono-2.0-bdwgc.pdb\n");
132132
133133
copy("$monoroot/msvc/build/sgen/$archNameForBuild/bin/$configDirName/mono-sgen.exe", "$monoprefix/bin/.") or die ("failed copying mono-sgen.exe\n");
134134
copy("$monoroot/msvc/build/sgen/$archNameForBuild/bin/$configDirName/mono-2.0-sgen.dll", "$monoprefix/bin/.") or die ("failed copying mono-2.0-sgen.dll\n");

msvc/mono.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<BOEHM_DEFINES>HAVE_BOEHM_GC</BOEHM_DEFINES>
7171
<GC_DEFINES>$(BOEHM_DEFINES)</GC_DEFINES>
7272
<GC_LIB>libgc.lib</GC_LIB>
73-
<MONO_TARGET_SUFFIX Condition="'$(MONO_USE_TARGET_SUFFIX)'=='true'">-boehm</MONO_TARGET_SUFFIX>
73+
<MONO_TARGET_SUFFIX Condition="'$(MONO_USE_TARGET_SUFFIX)'=='true'">-bdwgc</MONO_TARGET_SUFFIX>
7474
<MONO_BUILD_DIR_PREFIX Condition="'$(MONO_USE_SEPARATE_BUILD_DIR)'=='true'">$(MONO_BUILD_DIR_PREFIX)boehm/</MONO_BUILD_DIR_PREFIX>
7575
</PropertyGroup>
7676
<PropertyGroup Label="Static-Mono-Libraries">

0 commit comments

Comments
 (0)