diff --git a/rustc-1.74.0-overrides.toml b/rustc-1.74.0-overrides.toml new file mode 100644 index 00000000..60ca73cb --- /dev/null +++ b/rustc-1.74.0-overrides.toml @@ -0,0 +1,28 @@ +# +# minicargo overrides file +# + +## rustc needs rustc's libproc_macro (not mrustc's) +#[add.'compiler/rustc_expand'.dependencies] +#proc_macro = { path = "../../library/proc_macro" } +#[add.'compiler/rustc_builtin_macros'.dependencies] +#proc_macro = { path = "../../library/proc_macro" } +#[add.'compiler/rustc_metadata'.dependencies] +#proc_macro = { path = "../../library/proc_macro" } +# +# +#[add.'library/std'.dependencies.compiler_builtins] +#features = ["no-asm"] +#[add.'library/panic_unwind'.dependencies.compiler_builtins] +#features = ["no-asm"] +# +# +#[delete] +## Allow rustc's libproc_macro to build by removing the std dependency (it's built during rustc build, not during std build) +#'library/proc_macro' = [ +# "dependencies.std", +# ] +## mrustc has already built a proc_macro, remove it from libtest's deps (used on linux) +#'library/test' = [ +# "dependencies.proc_macro", +# ] diff --git a/rustc-1.74.0-src.patch b/rustc-1.74.0-src.patch new file mode 100644 index 00000000..e69de29b diff --git a/vsproject/build_std_174.cmd b/vsproject/build_std_174.cmd new file mode 100644 index 00000000..0d46b8c7 --- /dev/null +++ b/vsproject/build_std_174.cmd @@ -0,0 +1,20 @@ +@set MRUSTC_TARGET_VER=1.74 +@set RUSTC_VERSION=1.74.0 +@set OUTDIR=output-%RUSTC_VERSION% +@set COMMON_ARGS=--vendor-dir ..\rustc-%RUSTC_VERSION%-src\vendor --manifest-overrides ..\rustc-%RUSTC_VERSION%-overrides.toml +@if defined PARLEVEL ( set COMMON_ARGS=%COMMON_ARGS% -j %PARLEVEL% ) +@if "%1" == "mmir" ( + set COMMON_ARGS=%COMMON_ARGS% -Z emit-mmir + set OUTDIR=%OUTDIR%-mmir +) +@set STD_ARGS=--output-dir %OUTDIR% %COMMON_ARGS% +@set STD_ARGS=%STD_ARGS% --script-overrides ..\script-overrides\stable-%RUSTC_VERSION%-windows +@mkdir %OUTDIR% + +x64\Release\minipatch.exe ..\rustc-1.74.0-src.patch ..\rustc-1.74.0-src +@if %errorlevel% neq 0 exit /b %errorlevel% + +x64\Release\minicargo.exe ..\rustc-%RUSTC_VERSION%-src\library\test %STD_ARGS% +@if %errorlevel% neq 0 exit /b %errorlevel% +x64\Release\minicargo.exe ..\lib\libproc_macro %COMMON_ARGS% --output-dir %OUTDIR% +@if %errorlevel% neq 0 exit /b %errorlevel% \ No newline at end of file