Merge pull request mono/mono#17749 from directhex/dotnet-llvm-monorepo

[LLVM] Change llvm submodule to dotnet-org fork of official LLVM git repo Commit migrated from mono/mono@3948a06
Si1ver · Nov 8, 2019 · 07b9387 · 07b9387
2 parents 150bd36 + 4da174e
commit 07b9387
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/src/mono/msvc/build-external-btls.bat b/src/mono/msvc/build-external-btls.bat
@@ -235,6 +235,7 @@ if "%GIT%" == "" (
 )
 
 :: Make sure boringssl submodule is up to date.
+echo Updating submodule "%BTLS_DIR%"
 "%GIT%" submodule update --init -- "%BTLS_DIR%"
 if not ERRORLEVEL == 0 (
     "%GIT%" submodule init -- "%BTLS_DIR%"

diff --git a/src/mono/msvc/build-external-llvm.bat b/src/mono/msvc/build-external-llvm.bat
@@ -239,6 +239,7 @@ if "%GIT%" == "" (
 )
 
 :: Make sure llvm submodule is up to date.
+echo Updating submodule "%LLVM_DIR%"
 "%GIT%" submodule update --init -- "%LLVM_DIR%"
 if not ERRORLEVEL == 0 (
     "%GIT%" submodule init -- "%LLVM_DIR%"
@@ -276,6 +277,13 @@ if not "%CMAKE_GENERATOR_ARCH%" == "" (
     set CMAKE_GENERATOR_ARCH=-A %CMAKE_GENERATOR_ARCH%
 )
 
+:: Check if LLVM_DIR is just repro root or if we should build
+:: a llvm subfolder within that repository.
+set "LLVM_SOURCE_DIR=%LLVM_DIR%"
+if exist "%LLVM_SOURCE_DIR%\llvm\CMakeLists.txt" (
+	set "LLVM_SOURCE_DIR=%LLVM_DIR%\llvm"
+)
+
 :: Run cmake.
 "%CMAKE%" ^
 -DCMAKE_INSTALL_PREFIX="%LLVM_INSTALL_DIR%" ^
@@ -293,7 +301,7 @@ if not "%CMAKE_GENERATOR_ARCH%" == "" (
 %CMAKE_GENERATOR_ARGS% ^
 -G "%CMAKE_GENERATOR%" ^
 %CMAKE_GENERATOR_ARCH% ^
-"%LLVM_DIR%"
+"%LLVM_SOURCE_DIR%"
 
 if not ERRORLEVEL == 0 (
     goto ON_ERROR

diff --git 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</_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>
+</Project>
diff --git 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>
+</Project>
diff --git 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