Remove build_sysroot folder
#2
Conversation
GuillaumeGomez
force-pushed
the
rm-build_sysroot-folder
branch
from
97cb210 to
f191ca0
Compare
| @@ -116,17 +89,11 @@ fn prepare_libcore( | |||
| patches.sort(); | |||
| for file_path in patches { | |||
| println!("[GIT] apply `{}`", file_path.display()); | |||
| let path = Path::new("../..").join(file_path); | |||
| let path = Path::new("../../..").join(file_path); | |||
There was a problem hiding this comment.
Would it be clearer to use an absolute path?
There was a problem hiding this comment.
Hard to say...
build_system/src/test.rs
Outdated
| ] | ||
| .iter() | ||
| .any(|check| line.contains(check)) | ||
| if ["//@ error-pattern:", "//@ build-fail", "//@ run-fail", "-Cllvm-args", "//~", "thread"] |
There was a problem hiding this comment.
I would prefer to keep the original formatting, so please use #[rustfmt::skip] or whatever.
There was a problem hiding this comment.
Sounds good to me.
|
The CI failed, possible because you would need to adjust the |
GuillaumeGomez
force-pushed
the
rm-build_sysroot-folder
branch
6 times, most recently
from
b191cc7 to
bfed583
Compare
.github/workflows/release.yml
Outdated
| @@ -63,7 +63,7 @@ jobs: | |||
| git config --global user.name "User" | |||
| ./y.sh prepare | |||
| # FIXME(antoyo): we cannot enable LTO for stdarch tests currently because of some failing LTO tests using proc-macros. | |||
| echo -n 'lto = "fat"' >> build_sysroot/Cargo.toml | |||
| echo -n 'lto = "fat"' >> build/build_sysroot/Cargo.toml | |||
There was a problem hiding this comment.
Could the CI failure due to the fact that this change is overwritten by the fact that you now copy this file?
There was a problem hiding this comment.
Hum indeed.
GuillaumeGomez
force-pushed
the
rm-build_sysroot-folder
branch
2 times, most recently
from
d8156a6 to
f863069
Compare
.github/workflows/stdarch.yml
Outdated
| cd build_sysroot/sysroot_src/library/stdarch/ | ||
| CHANNEL=release TARGET=x86_64-unknown-linux-gnu CG_RUSTFLAGS="-Ainternal_features" ../../../../y.sh cargo test | ||
| cd build/build_sysroot/sysroot_src/library/stdarch/ | ||
| CHANNEL=release TARGET=x86_64-unknown-linux-gnu CG_RUSTFLAGS="-Ainternal_features" ../../../../../y.sh cargo test |
There was a problem hiding this comment.
This is starting to have many ../. Would it work to use --manifest-path instead (without changing directory)?
There was a problem hiding this comment.
It's worth a try.
| x if runners.contains_key(x) => { | ||
| test_arg.runners.insert(x.into()); | ||
| x if runners.contains_key(x) | ||
| && !test_arg.runners.iter().any(|runner| runner == x) => |
There was a problem hiding this comment.
| && !test_arg.runners.iter().any(|runner| runner == x) => | |
| && !test_arg.runners.contains(x) => |
There was a problem hiding this comment.
It's what I did first, but:
error[E0308]: mismatched types
--> src/test.rs:131:51
|
131 | && !test_arg.runners.contains(x) =>
| -------- ^ expected `&String`, found `&str`
| |
| arguments to this method are incorrect
|
= note: expected reference `&std::string::String`
found reference `&str`
f8d21b2 to
07e9497
Compare
GuillaumeGomez
force-pushed
the
rm-build_sysroot-folder
branch
from
07e9497 to
da070d3
Compare
|
Thanks for your contribution. |
With this, the top-level directory is finally clean.