Fix build system #9

mubarak23 · 2024-03-24T15:34:45Z

No description provided.

antoyo · 2024-03-24T15:41:21Z

build_system/src/build.rs

@@ -29,6 +29,16 @@ impl BuildArg {
                        );
                    }
                }
+                "--sysroot" => {
+                    if let Some(arg) = args.next() {
+                        build_arg.flags.push("--sysroot".to_string());


This is not what should be done.

Instead, this new --sysroot flag that you added should be used to determine if we should build the sysroot or not. This happens here.

instead we should call build_sysroot(&env, &args.config_info)?; on the if check

In this function, set a new field that you can add on this struct to true and in the link from my comment above, wrap the call to build_sysroot in an if that will check if this new field is set to true.

adding a boolean flag on this BuildArg, then set it to TRUE on --sysroot passed

antoyo · 2024-03-24T15:41:27Z

build_system/src/test.rs

@@ -138,6 +138,16 @@ impl TestArg {
                        return Err("Expected an argument after `--features`, found nothing".into())
                    }
                },
+                "--sysroot" => match args.next() {


This file already contain an option to build the sysroot here, so it should not be needed.

i will remove this

antoyo

The CI failed, so the code needs a fix, but looks good otherwise.

antoyo · 2024-03-24T16:52:21Z

build_system/src/build.rs

@@ -9,6 +9,7 @@ use std::path::Path;
 struct BuildArg {
    flags: Vec<String>,
    config_info: ConfigInfo,
+    sys_root: bool,


I would prefer this spelling:

Suggested change

sys_root: bool,

sysroot: bool,

mubarak23 · 2024-03-24T16:55:36Z

what could make the CI failed

antoyo · 2024-03-24T16:57:30Z

You can see the results of the CI at the bottom of this page. If you click on this one, for example, it shows you the build errors.

antoyo · 2024-03-24T17:49:34Z

There's still one error (and a warning) to fix in the CI. Keep up the good work.

Btw, do you get notified for the CI failures?

mubarak23 · 2024-03-24T18:21:28Z

Yes I get notifications for CI failure ,
I will look into it and push a fix

mubarak23 · 2024-03-24T19:23:35Z

the error is from arg.sysroot = true; on looking at the code again, i am suppose to use build_arg.sysroot= true

antoyo · 2024-03-24T19:25:17Z

The new error in the CI is because you now need to use this new --sysroot flag in the CI jobs that are in this directory.

mubarak23 · 2024-03-24T19:32:43Z

you mean something like this cargo clippy --all-targets --sysroot master -- -D warnings in ci.yml file

antoyo · 2024-03-24T19:34:08Z

No, the argument you added is for the build command from the build system, so whenever you see ./y.sh build, please add --sysroot after.

mubarak23 · 2024-03-24T19:35:28Z

Alright

antoyo

It seems the sysroot is still not built in the CI.

Does this work locally on your side?

antoyo · 2024-03-24T20:16:48Z

build_system/src/build.rs

@@ -220,8 +225,11 @@ fn build_codegen(args: &mut BuildArg) -> Result<(), String> {
    })?;

    println!("[BUILD] sysroot");


Please move this line inside the if.

Alright, could be the reason why the CI is failing

mubarak23 · 2024-03-24T20:38:10Z

It seems the sysroot is still not built in the CI.

Does this work locally on your side?

am getting the following on local macbookpro@MacBooks-MBP-2 rustc_codegen_gcc % ./y.sh build --sysroot

[BUILD] build system
    Finished `release` profile [optimized] target(s) in 0.02s

antoyo · 2024-03-24T20:41:20Z

build_system/src/build.rs

@@ -224,7 +224,6 @@ fn build_codegen(args: &mut BuildArg) -> Result<(), String> {
        )
    })?;

-    println!("[BUILD] sysroot");
    if args.sysroot {


I mean to actually move it like this:

println!("[BUILD] sysroot"); if args.sysroot {

antoyo · 2024-03-24T20:42:34Z

It seems the sysroot is still not built in the CI.
Does this work locally on your side?

am getting the following on local macbookpro@MacBooks-MBP-2 rustc_codegen_gcc % ./y.sh build --sysroot
[BUILD] build system
    Finished `release` profile [optimized] target(s) in 0.02s

You're missing the actual build of the sysroot.
If you run ./y.sh build on the master branch, you get this which is the expected result:

[BUILD] build system
   Compiling y v0.1.0 (/home/bouanto/Ordinateur/Programmation/Rust/Projets/rustc_codegen_gcc/build_system)
    Finished `release` profile [optimized] target(s) in 1.35s
    Finished `dev` profile [optimized + debuginfo] target(s) in 0.05s
[BUILD] sysroot
    Updating crates.io index
   Compiling core v0.0.0 (/home/bouanto/Ordinateur/Programmation/Rust/Projets/rustc_codegen_gcc/build_sysroot/sysroot_src/library/core)
   Compiling compiler_builtins v0.1.108
   Compiling libc v0.2.153
   Compiling std v0.0.0 (/home/bouanto/Ordinateur/Programmation/Rust/Projets/rustc_codegen_gcc/build_sysroot/sysroot_src/library/std)
   Compiling rustc-std-workspace-core v1.99.0 (/home/bouanto/Ordinateur/Programmation/Rust/Projets/rustc_codegen_gcc/build_sysroot/sysroot_src/library/rustc-std-workspace-core)
   Compiling alloc v0.0.0 (/home/bouanto/Ordinateur/Programmation/Rust/Projets/rustc_codegen_gcc/build_sysroot/sysroot_src/library/alloc)
   Compiling cfg-if v1.0.0
   Compiling adler v1.0.2
   Compiling memchr v2.7.1
   Compiling rustc-demangle v0.1.23
   Compiling unwind v0.0.0 (/home/bouanto/Ordinateur/Programmation/Rust/Projets/rustc_codegen_gcc/build_sysroot/sysroot_src/library/unwind)
   Compiling rustc-std-workspace-alloc v1.99.0 (/home/bouanto/Ordinateur/Programmation/Rust/Projets/rustc_codegen_gcc/build_sysroot/sysroot_src/library/rustc-std-workspace-alloc)
   Compiling panic_unwind v0.0.0 (/home/bouanto/Ordinateur/Programmation/Rust/Projets/rustc_codegen_gcc/build_sysroot/sysroot_src/library/panic_unwind)
   Compiling panic_abort v0.0.0 (/home/bouanto/Ordinateur/Programmation/Rust/Projets/rustc_codegen_gcc/build_sysroot/sysroot_src/library/panic_abort)
   Compiling gimli v0.28.1
   Compiling miniz_oxide v0.7.2
   Compiling std_detect v0.1.5 (/home/bouanto/Ordinateur/Programmation/Rust/Projets/rustc_codegen_gcc/build_sysroot/sysroot_src/library/stdarch/crates/std_detect)
   Compiling object v0.32.2
   Compiling hashbrown v0.14.3
   Compiling addr2line v0.21.0
   Compiling rustc-std-workspace-std v1.99.0 (/home/bouanto/Ordinateur/Programmation/Rust/Projets/rustc_codegen_gcc/build_sysroot/sysroot_src/library/rustc-std-workspace-std)
   Compiling proc_macro v0.0.0 (/home/bouanto/Ordinateur/Programmation/Rust/Projets/rustc_codegen_gcc/build_sysroot/sysroot_src/library/proc_macro)
   Compiling unicode-width v0.1.11
   Compiling getopts v0.2.21
   Compiling test v0.0.0 (/home/bouanto/Ordinateur/Programmation/Rust/Projets/rustc_codegen_gcc/build_sysroot/sysroot_src/library/test)
   Compiling sysroot v0.0.0 (/home/bouanto/Ordinateur/Programmation/Rust/Projets/rustc_codegen_gcc/build_sysroot)
    Finished `dev` profile [unoptimized + debuginfo] target(s) in 48.27s

Do you know why it doesn't work with the code from this PR?

mubarak23 · 2024-03-24T20:58:36Z

It seems the sysroot is still not built in the CI.
Does this work locally on your side?

am getting the following on local macbookpro@MacBooks-MBP-2 rustc_codegen_gcc % ./y.sh build --sysroot
[BUILD] build system
    Finished `release` profile [optimized] target(s) in 0.02s

You're missing the actual build of the sysroot. If you run ./y.sh build on the master branch, you get this which is the expected result:

[BUILD] build system
   Compiling y v0.1.0 (/home/bouanto/Ordinateur/Programmation/Rust/Projets/rustc_codegen_gcc/build_system)
    Finished `release` profile [optimized] target(s) in 1.35s
    Finished `dev` profile [optimized + debuginfo] target(s) in 0.05s
[BUILD] sysroot
    Updating crates.io index
   Compiling core v0.0.0 (/home/bouanto/Ordinateur/Programmation/Rust/Projets/rustc_codegen_gcc/build_sysroot/sysroot_src/library/core)
   Compiling compiler_builtins v0.1.108
   Compiling libc v0.2.153
   Compiling std v0.0.0 (/home/bouanto/Ordinateur/Programmation/Rust/Projets/rustc_codegen_gcc/build_sysroot/sysroot_src/library/std)
   Compiling rustc-std-workspace-core v1.99.0 (/home/bouanto/Ordinateur/Programmation/Rust/Projets/rustc_codegen_gcc/build_sysroot/sysroot_src/library/rustc-std-workspace-core)
   Compiling alloc v0.0.0 (/home/bouanto/Ordinateur/Programmation/Rust/Projets/rustc_codegen_gcc/build_sysroot/sysroot_src/library/alloc)
   Compiling cfg-if v1.0.0
   Compiling adler v1.0.2
   Compiling memchr v2.7.1
   Compiling rustc-demangle v0.1.23
   Compiling unwind v0.0.0 (/home/bouanto/Ordinateur/Programmation/Rust/Projets/rustc_codegen_gcc/build_sysroot/sysroot_src/library/unwind)
   Compiling rustc-std-workspace-alloc v1.99.0 (/home/bouanto/Ordinateur/Programmation/Rust/Projets/rustc_codegen_gcc/build_sysroot/sysroot_src/library/rustc-std-workspace-alloc)
   Compiling panic_unwind v0.0.0 (/home/bouanto/Ordinateur/Programmation/Rust/Projets/rustc_codegen_gcc/build_sysroot/sysroot_src/library/panic_unwind)
   Compiling panic_abort v0.0.0 (/home/bouanto/Ordinateur/Programmation/Rust/Projets/rustc_codegen_gcc/build_sysroot/sysroot_src/library/panic_abort)
   Compiling gimli v0.28.1
   Compiling miniz_oxide v0.7.2
   Compiling std_detect v0.1.5 (/home/bouanto/Ordinateur/Programmation/Rust/Projets/rustc_codegen_gcc/build_sysroot/sysroot_src/library/stdarch/crates/std_detect)
   Compiling object v0.32.2
   Compiling hashbrown v0.14.3
   Compiling addr2line v0.21.0
   Compiling rustc-std-workspace-std v1.99.0 (/home/bouanto/Ordinateur/Programmation/Rust/Projets/rustc_codegen_gcc/build_sysroot/sysroot_src/library/rustc-std-workspace-std)
   Compiling proc_macro v0.0.0 (/home/bouanto/Ordinateur/Programmation/Rust/Projets/rustc_codegen_gcc/build_sysroot/sysroot_src/library/proc_macro)
   Compiling unicode-width v0.1.11
   Compiling getopts v0.2.21
   Compiling test v0.0.0 (/home/bouanto/Ordinateur/Programmation/Rust/Projets/rustc_codegen_gcc/build_sysroot/sysroot_src/library/test)
   Compiling sysroot v0.0.0 (/home/bouanto/Ordinateur/Programmation/Rust/Projets/rustc_codegen_gcc/build_sysroot)
    Finished `dev` profile [unoptimized + debuginfo] target(s) in 48.27s

Do you know why it doesn't work with the code from this PR?

i have no idea, i will switch to the master and run the build

mubarak23 · 2024-03-25T15:40:23Z

Looking at logs again, i keep seeing error below, as found here

 ---- lang_tests::gep.rs stderr ----

error[E0463]: can't find crate for `std`

error: could not compile `rustc_codegen_gcc` (lib) due to 1 previous error
warning: build failed, waiting for other jobs to finish...
error: linking with `cc` failed: exit status: 1
``` [found here](https://github.com/antoyo/rustc_codegen_gcc/actions/runs/8412062922/job/23032446290?pr=9)

antoyo · 2024-03-25T15:43:01Z

Yes, this is because the sysroot is not actually built.
Somehow, your PR changed the build system in a way that prevent the sysroot to be built (even with the --sysroot flag).
You need to figure out why this is happening.
As mentioned before, you should see [BUILD] sysroot in the logs.

mubarak23 · 2024-03-25T15:58:11Z

I will look at the places where I made the changes on my branch and compare it the place on the master branch

mubarak23 · 2024-03-26T16:01:21Z

after looking at where i made change on my PR Branch and the master branch, this is piece of code that i addedcreate_dir(gccjit_target)?;

antoyo · 2024-03-27T12:33:46Z

build_system/src/build.rs

+            gccjit_target, error
+        )
+    })?;
+


Perhas you could try print the field to see if we actually reach this line before the if:

println!("Build sysroot: {}", args.sysroot);

Yaah, i will try this

It is not even printed, so we don't even reach this code.
Do you have any idea what in this PR could have the effect of skipping this code?

I suspect the build command

You can try adding println! calls in a few places (especially where you changed the code) to see where it stops happening.

so far, this is the only place, we added the sysroot flag

- name: Build run: | ./y.sh prepare --only-libcore ./y.sh build --sysroot cargo test

in the ci.yml file
i remove it from all other places i added it

mubarak23 · 2024-03-27T13:58:23Z

i will add args.sysroot = false; in run() function

mubarak23 · 2024-03-27T15:12:38Z

where could this error come from error[E0463]: can't find crate for std``

antoyo · 2024-03-27T15:30:53Z

This is because the sysroot is not built. Building the sysroot means building std among other things.

mubarak23 · 2024-03-27T15:44:19Z

should i pull out a new branch from master and push my work on it, i feel like the current branch on this PR is currupt

antoyo · 2024-03-27T15:45:52Z

Yes, you can do that.

antoyo · 2024-04-07T12:57:56Z

Was superceeded by #13.

mubarak23 added 2 commits March 24, 2024 14:13

build from sysroot

0f83498

add unit for --sysroot flag

341ce66

antoyo reviewed Mar 24, 2024

View reviewed changes

mubarak23 added 2 commits March 24, 2024 17:04

refactor --sysroot to use build_sysroot function

cc261c3

add boolean flag and check

12bb043

antoyo reviewed Mar 24, 2024

View reviewed changes

mubarak23 added 2 commits March 24, 2024 17:59

change variable name

a35aa22

change function return

151f761

fix error with struct field call

271e9e1

mubarak23 added 5 commits March 24, 2024 20:41

Update ci.yml

352062a

Update gcc12.yml

3c90301

Update m68k.yml

568e56d

Update release.yml

0d2537d

Update stdarch.yml

f815427

antoyo reviewed Mar 24, 2024

View reviewed changes

remove println!

838449a

antoyo reviewed Mar 24, 2024

View reviewed changes

mubarak23 added 2 commits March 24, 2024 21:54

print log for sysroot build

8c2fa78

fix merge error

bf81fd6

Merge branch 'master' into fix-build-system

3c99877

fix push conflict

4280744

remove --sysroot flag

26fe507

antoyo mentioned this pull request Mar 27, 2024

Execute tests using a target defined as a JSON spec #12

Merged

antoyo reviewed Mar 27, 2024

View reviewed changes

mubarak23 added 2 commits March 27, 2024 14:03

log before the check

1878128

log where flag is set

e40ac6c

mubarak23 added 3 commits March 27, 2024 15:00

add systroot on run fn

dca1913

fix call on structs

5052bb5

remove sysroot from CI

93ef77b

antoyo closed this Apr 7, 2024

		@@ -220,8 +225,11 @@ fn build_codegen(args: &mut BuildArg) -> Result<(), String> {
		})?;

		println!("[BUILD] sysroot");

Fix build system #9

Fix build system #9

Conversation

mubarak23 commented Mar 24, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

antoyo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mubarak23 commented Mar 24, 2024

antoyo commented Mar 24, 2024

antoyo commented Mar 24, 2024

mubarak23 commented Mar 24, 2024

mubarak23 commented Mar 24, 2024

antoyo commented Mar 24, 2024

mubarak23 commented Mar 24, 2024

antoyo commented Mar 24, 2024

mubarak23 commented Mar 24, 2024

antoyo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mubarak23 commented Mar 24, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

antoyo commented Mar 24, 2024

mubarak23 commented Mar 24, 2024

mubarak23 commented Mar 25, 2024

antoyo commented Mar 25, 2024

mubarak23 commented Mar 25, 2024

mubarak23 commented Mar 26, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mubarak23 Mar 27, 2024 • edited Loading

Choose a reason for hiding this comment

mubarak23 commented Mar 27, 2024

mubarak23 commented Mar 27, 2024

antoyo commented Mar 27, 2024

mubarak23 commented Mar 27, 2024

antoyo commented Mar 27, 2024

antoyo commented Apr 7, 2024

mubarak23 Mar 27, 2024 •

edited

Loading