summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Hodge <tpg@mutabah.net>2019-11-09 21:03:24 +0800
committerJohn Hodge <tpg@mutabah.net>2019-11-09 21:03:24 +0800
commit9addf62c2793fad9cf6807f106fd4f5bf13806af (patch)
tree2f94383b9f8c5527e450efff0d30c6d1aaba6a6b
parent77537e2059497acb2bbcf5b49dacd43160717b88 (diff)
downloadmrust-9addf62c2793fad9cf6807f106fd4f5bf13806af.tar.gz
vsproject - Tweak scripts to run smiri
-rw-r--r--vsproject/build_hello_mmir.cmd16
-rw-r--r--vsproject/build_rustc_minicargo_mmir.cmd12
2 files changed, 16 insertions, 12 deletions
diff --git a/vsproject/build_hello_mmir.cmd b/vsproject/build_hello_mmir.cmd
new file mode 100644
index 00000000..30ac5ccc
--- /dev/null
+++ b/vsproject/build_hello_mmir.cmd
@@ -0,0 +1,16 @@
+@echo off
+@set RUSTC_VERSION=1.29.0
+@set OUTDIR=output-%RUSTC_VERSION%-mmir
+@mkdir %OUTDIR%
+
+x64\Release\minicargo.exe ..\rustc-%RUSTC_VERSION%-src\src\libstd --script-overrides ..\script-overrides\stable-%RUSTC_VERSION%-windows --output-dir %OUTDIR% -Z emit-mmir
+if %errorlevel% neq 0 exit /b %errorlevel%
+x64\Release\minicargo.exe ..\rustc-%RUSTC_VERSION%-src\src\libpanic_unwind --script-overrides ..\script-overrides\stable-%RUSTC_VERSION%-windows --output-dir %OUTDIR% -Z emit-mmir
+if %errorlevel% neq 0 exit /b %errorlevel%
+x64\Release\minicargo.exe ..\rustc-%RUSTC_VERSION%-src\src\libtest --vendor-dir ..\rustc-%RUSTC_VERSION%-src\src\vendor --script-overrides ..\script-overrides\stable-%RUSTC_VERSION%-windows --output-dir %OUTDIR% -Z emit-mmir
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+x64\Release\mrustc.exe ..\rustc-%RUSTC_VERSION%-src\src\test\run-pass\hello.rs -L %OUTDIR% -o %OUTDIR%\hello.exe -C codegen-type=monomir
+if %errorlevel% neq 0 exit /b %errorlevel%
+x64\Release\standalone_miri.exe %OUTDIR%\hello.exe.mir
+if %errorlevel% neq 0 exit /b %errorlevel% \ No newline at end of file
diff --git a/vsproject/build_rustc_minicargo_mmir.cmd b/vsproject/build_rustc_minicargo_mmir.cmd
deleted file mode 100644
index a6409391..00000000
--- a/vsproject/build_rustc_minicargo_mmir.cmd
+++ /dev/null
@@ -1,12 +0,0 @@
-@echo off
-x64\Release\minicargo.exe ..\rustc-1.19.0-src\src\libstd --script-overrides ..\script-overrides\stable-1.19.0 --output-dir output_mmir -Z emit-mmir
-if %errorlevel% neq 0 exit /b %errorlevel%
-x64\Release\minicargo.exe ..\rustc-1.19.0-src\src\libpanic_unwind --script-overrides ..\script-overrides\stable-1.19.0 --output-dir output_mmir -Z emit-mmir
-if %errorlevel% neq 0 exit /b %errorlevel%
-x64\Release\minicargo.exe ..\rustc-1.19.0-src\src\libtest --script-overrides ..\script-overrides\stable-1.19.0 --output-dir output_mmir -Z emit-mmir
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-x64\Release\mrustc.exe ..\rustc-1.19.0-src\src\test\run-pass\hello.rs -L output_mmir -o output_mmir\hello.exe -C codegen-type=monomir
-if %errorlevel% neq 0 exit /b %errorlevel%
-x64\Release\standalone_miri.exe output_mmir\hello.exe.mir
-if %errorlevel% neq 0 exit /b %errorlevel% \ No newline at end of file