Skip to content

Commit 386e6cb

Browse files
radekdoulikjonpryor
authored andcommitted
[linker] Use mono's linker submodule (#944)
Use mono's `external/linker` submodule reference instead of including our own, separate, `linker` submodule reference. This way we are more consistent with xamarin-macios, which also uses mono's linker submodule.
1 parent 855ad00 commit 386e6cb

File tree

3 files changed

+1
-6
lines changed

3 files changed

+1
-6
lines changed

.gitmodules

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929
path = external/llvm
3030
url = https://github.com/mono/llvm.git
3131
branch = master
32-
[submodule "external/linker"]
33-
path = external/linker
34-
url = https://github.com/mono/linker.git
35-
branch = master
3632
[submodule "external/proguard"]
3733
path = external/proguard
3834
url = https://github.com/xamarin/proguard.git

Configuration.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<MonoRequiredMaximumVersion Condition=" '$(MonoRequiredMaximumVersion)' == '' ">5.9.0</MonoRequiredMaximumVersion>
5959
<IgnoreMaxMonoVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' ">True</IgnoreMaxMonoVersion>
6060
<MonoRequiredDarwinMinimumVersion>$(MonoRequiredMinimumVersion).22</MonoRequiredDarwinMinimumVersion>
61-
<LinkerSourceDirectory>$(MSBuildThisFileDirectory)external\linker</LinkerSourceDirectory>
61+
<LinkerSourceDirectory>$(MSBuildThisFileDirectory)external\mono\external\linker</LinkerSourceDirectory>
6262
<OpenTKSourceDirectory>$(MSBuildThisFileDirectory)external\opentk</OpenTKSourceDirectory>
6363
<LibZipSourceDirectory Condition=" '$(LibZipSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\libzip</LibZipSourceDirectory>
6464
<LibZipSharpSourceDirectory Condition=" '$(LibZipSharpSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\LibZipSharp</LibZipSharpSourceDirectory>

external/linker

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)