[llvm] redirect from mono llvm-mirror fork to dotnet llvm-project fork

Commit migrated from https://github.com/mono/mono/commit/b61263e994a326e3b3d302bca0194f73f0b6534e

diff --git a/src/mono/msvc/mono.external.targets b/src/mono/msvc/mono.external.targets
index b679179..b47e4ac 100644 (file)
--- a/src/mono/msvc/mono.external.targets
+++ b/src/mono/msvc/mono.external.targets
@@ -112,7 +112,7 @@
 
     <PropertyGroup>
         <_LLVMSourceDir Condition="'$(_LLVMSourceDir)' == ''">$(MONO_INTERNAL_LLVM_SOURCE_DIR)</_LLVMSourceDir>
-        <_LLVMSourceDir Condition="'$(_LLVMSourceDir)' == ''">$(_MonoSourceDir)\external\llvm</_LLVMSourceDir>
+        <_LLVMSourceDir Condition="'$(_LLVMSourceDir)' == ''">$(_MonoSourceDir)\external\llvm-project\llvm</_LLVMSourceDir>
         <_LLVMBuildDir Condition="'$(_LLVMBuildDir)' == ''">$([System.IO.Path]::GetFullPath('$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\external\llvm-build\$(Configuration)'))</_LLVMBuildDir>
         <_LLVMInstallDir Condition="'$(_LLVMInstallDir)' == ''">$(_LLVMBuildDir)\install</_LLVMInstallDir>
         <_MonoLLVMConfig>$(_LLVMInstallDir)\bin\llvm-config.exe</_MonoLLVMConfig>
@@ -240,4 +240,4 @@
         </PrepareForBuildDependsOn>
     </PropertyGroup>
 
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/mono/msvc/mono.props b/src/mono/msvc/mono.props
index afd7ecd..88fb969 100644 (file)
--- a/src/mono/msvc/mono.props
+++ b/src/mono/msvc/mono.props
@@ -44,7 +44,7 @@
     <LIBGC_CPPFLAGS_INCLUDE>$(MONO_LIBGC_INCLUDE_DIR)</LIBGC_CPPFLAGS_INCLUDE>
     <GLIB_CFLAGS_INCLUDE>$(MONO_EGLIB_SOURCE_DIR)</GLIB_CFLAGS_INCLUDE>
     <MONO_LLVM_DEFAULT_API_VERSION>610</MONO_LLVM_DEFAULT_API_VERSION>
-    <MONO_LLVM_DEFAULT_INCLUDE_DIR>$(MONO_DIR)/external/llvm/include</MONO_LLVM_DEFAULT_INCLUDE_DIR>
+    <MONO_LLVM_DEFAULT_INCLUDE_DIR>$(MONO_DIR)/external/llvm-project/llvm/include</MONO_LLVM_DEFAULT_INCLUDE_DIR>
   </PropertyGroup>
   <PropertyGroup Label="Static-C-Runtime" Condition="$(MONO_USE_STATIC_C_RUNTIME)=='true'">
     <MONO_C_RUNTIME Condition="'$(Configuration)'=='Debug'">MultiThreadedDebug</MONO_C_RUNTIME>
@@ -139,4 +139,4 @@
       <AdditionalLibraryDirectories>$(MONO_BUILD_DIR_PREFIX)$(Platform)/lib/$(Configuration)</AdditionalLibraryDirectories>
     </Lib>
   </ItemDefinitionGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/mono/netcore/build.sh b/src/mono/netcore/build.sh
index 4e57916..fe73413 100755 (executable)
--- a/src/mono/netcore/build.sh
+++ b/src/mono/netcore/build.sh
@@ -111,7 +111,7 @@ elif [[ "$configuration" == "Release" ]]; then
 fi
 
 if [ "$llvm" = "true" ]; then
-  git submodule update --init -- ../external/llvm || (Write-PipelineTelemetryError -c "git" -e 1 "Error fetching LLVM submodule" && exit 1)
+  git submodule update --init -- ../external/llvm-project || (Write-PipelineTelemetryError -c "git" -e 1 "Error fetching LLVM submodule" && exit 1)
   autogen_params="$autogen_params --enable-llvm"
 fi