diff options
| author | lateralusX <lateralusx.github@gmail.com> | 2019-11-08 11:39:07 +0300 |
|---|---|---|
| committer | Jo Shields <joshield@microsoft.com> | 2019-11-08 17:21:30 +0300 |
| commit | fad91a1c1e09df85040f8772d91eb6a5369303b4 (patch) | |
| tree | 1a32b94e0d1318245b2f633fda2be6cdf3fa0680 /msvc/build-external-llvm.bat | |
| parent | 4d579d00ff61b8713d6808c1fa7fb71472f0c4ee (diff) | |
Fix Windows LLVM build using new repository structure.
Diffstat (limited to 'msvc/build-external-llvm.bat')
| -rwxr-xr-x | msvc/build-external-llvm.bat | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/msvc/build-external-llvm.bat b/msvc/build-external-llvm.bat index 04cdd1c10de..697681879fd 100755 --- a/msvc/build-external-llvm.bat +++ b/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
|