Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlateralusX <lateralusx.github@gmail.com>2019-05-02 18:04:22 +0300
committerlateralusX <lateralusx.github@gmail.com>2019-05-03 16:14:21 +0300
commit488e15e8ab3245bd6faca4f8388f3844d3066314 (patch)
treedbf21f9e304a1cd2b333005b81e19c78f0a8d2d0 /msvc/build-external-llvm.bat
parentf83d9f3575776a5c7edad336f21f5c70ce519bc4 (diff)
Add support to include external build LLVM binaries in Mono build output.
Diffstat (limited to 'msvc/build-external-llvm.bat')
-rw-r--r--msvc/build-external-llvm.bat29
1 files changed, 1 insertions, 28 deletions
diff --git a/msvc/build-external-llvm.bat b/msvc/build-external-llvm.bat
index 22a0ad50938..bac098b49bf 100644
--- a/msvc/build-external-llvm.bat
+++ b/msvc/build-external-llvm.bat
@@ -275,37 +275,10 @@ if exist "%LLVM_BUILD_DIR%\install.vcxproj" (
"%MSBUILD%" "%LLVM_BUILD_DIR%\install.vcxproj" /p:Configuration=%VS_CONFIGURATION% /p:Platform=%VS_PLATFORM% /v:m /nologo
)
-if not exist "%LLVM_INSTALL_DIR%\bin\opt.exe" (
- echo Missing LLVM build output, "%LLVM_INSTALL_DIR%\bin\opt.exe"
+call "install-llvm-mono-build.bat" "%LLVM_INSTALL_DIR%" "%MONO_DIST_DIR%" || (
goto ON_ERROR
)
-if not exist "%LLVM_INSTALL_DIR%\bin\llc.exe" (
- echo Missing LLVM build output, "%LLVM_INSTALL_DIR%\bin\llc.exe"
- goto ON_ERROR
-)
-
-if not exist "%LLVM_INSTALL_DIR%\bin\llvm-dis.exe" (
- echo Missing LLVM build output, "%LLVM_INSTALL_DIR%\bin\llvm-dis.exe"
- goto ON_ERROR
-)
-
-if not exist "%LLVM_INSTALL_DIR%\bin\llvm-mc.exe" (
- echo Missing LLVM build output, "%LLVM_INSTALL_DIR%\bin\llvm-mc.exe"
- goto ON_ERROR
-)
-
-if not exist "%LLVM_INSTALL_DIR%\bin\llvm-as.exe" (
- echo Missing LLVM build output, "%LLVM_INSTALL_DIR%\bin\llvm-as.exe"
- goto ON_ERROR
-)
-
-copy /Y "%LLVM_INSTALL_DIR%\bin\opt.exe" "%MONO_DIST_DIR%" >nul 2>&1
-copy /Y "%LLVM_INSTALL_DIR%\bin\llc.exe" "%MONO_DIST_DIR%" >nul 2>&1
-copy /Y "%LLVM_INSTALL_DIR%\bin\llvm-dis.exe" "%MONO_DIST_DIR%" >nul 2>&1
-copy /Y "%LLVM_INSTALL_DIR%\bin\llvm-mc.exe" "%MONO_DIST_DIR%" >nul 2>&1
-copy /Y "%LLVM_INSTALL_DIR%\bin\llvm-as.exe" "%MONO_DIST_DIR%" >nul 2>&1
-
goto ON_SUCCESS
:ON_CLEAN_LLVM