diff options
| author | John Hodge <tpg@mutabah.net> | 2019-10-27 12:23:03 +0800 |
|---|---|---|
| committer | John Hodge <tpg@mutabah.net> | 2019-10-27 12:23:03 +0800 |
| commit | a319866e918756e547dc8ac43ab5c1ab1077fdbb (patch) | |
| tree | 58c9a3df050829980a5da29b0a518be4ea51c0a0 | |
| parent | 8c691e5bf130f27fa623213780cdf5eeb1105b4f (diff) | |
| download | mrust-a319866e918756e547dc8ac43ab5c1ab1077fdbb.tar.gz | |
vsproject - Fix bad paths, initial support for 1.29 building in scripts (can't get past libcore inline assembly yet)
| -rw-r--r-- | vsproject/build_std.cmd | 11 | ||||
| -rw-r--r-- | vsproject/mrustc.vcxproj | 4 | ||||
| -rw-r--r-- | vsproject/mrustc.vcxproj.filters | 4 |
3 files changed, 11 insertions, 8 deletions
diff --git a/vsproject/build_std.cmd b/vsproject/build_std.cmd index 0a360614..786648ec 100644 --- a/vsproject/build_std.cmd +++ b/vsproject/build_std.cmd @@ -1,9 +1,12 @@ @echo off -x64\Release\minicargo.exe ..\rustc-1.19.0-src\src\libstd --script-overrides ..\script-overrides\stable-1.19.0 +set RUSTC_VERSION=1.29.0 +set OUTDIR=output-%RUSTC_VERSION% +mkdir %OUTDIR% +x64\Release\minicargo.exe ..\rustc-%RUSTC_VERSION%-src\src\libstd --output-dir %OUTDIR% --script-overrides ..\script-overrides\stable-%RUSTC_VERSION% 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 +x64\Release\minicargo.exe ..\rustc-%RUSTC_VERSION%-src\src\libpanic_unwind --output-dir %OUTDIR% --script-overrides ..\script-overrides\stable-%RUSTC_VERSION% 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 +x64\Release\minicargo.exe ..\rustc-%RUSTC_VERSION%-src\src\libtest --output-dir %OUTDIR% --script-overrides ..\script-overrides\stable-%RUSTC_VERSION% if %errorlevel% neq 0 exit /b %errorlevel% -x64\Release\minicargo.exe ..\lib\libproc_macro +x64\Release\minicargo.exe ..\lib\libproc_macro --output-dir %OUTDIR% if %errorlevel% neq 0 exit /b %errorlevel% diff --git a/vsproject/mrustc.vcxproj b/vsproject/mrustc.vcxproj index 6cd135f4..6b73a8c8 100644 --- a/vsproject/mrustc.vcxproj +++ b/vsproject/mrustc.vcxproj @@ -157,8 +157,8 @@ <ProjectReference /> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\..\mrustc-merge_attempt_one\src\trans\auto_impls.cpp" /> - <ClCompile Include="..\..\mrustc-merge_attempt_one\src\trans\mangling_v2.cpp" /> + <ClCompile Include="..\src\trans\auto_impls.cpp" /> + <ClCompile Include="..\src\trans\mangling_v2.cpp" /> <ClCompile Include="..\src\ast\ast.cpp" /> <ClCompile Include="..\src\ast\crate.cpp" /> <ClCompile Include="..\src\ast\dump.cpp" /> diff --git a/vsproject/mrustc.vcxproj.filters b/vsproject/mrustc.vcxproj.filters index 9d9dbcb4..d94cdca8 100644 --- a/vsproject/mrustc.vcxproj.filters +++ b/vsproject/mrustc.vcxproj.filters @@ -386,10 +386,10 @@ <ClCompile Include="..\src\version.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\mrustc-merge_attempt_one\src\trans\auto_impls.cpp"> + <ClCompile Include="..\src\trans\auto_impls.cpp"> <Filter>Source Files\trans</Filter> </ClCompile> - <ClCompile Include="..\..\mrustc-merge_attempt_one\src\trans\mangling_v2.cpp"> + <ClCompile Include="..\src\trans\mangling_v2.cpp"> <Filter>Source Files\trans</Filter> </ClCompile> <ClCompile Include="..\src\hir_conv\resolve_ufcs_outer.cpp"> |