Skip to content

Conversation

@folkertdev
Copy link
Contributor

Preparation for combining the C files. That is the biggest speedup, so I want to do that first to make later refactorings less painful.

@folkertdev folkertdev marked this pull request as ready for review July 10, 2025 22:28
@rustbot
Copy link
Collaborator

rustbot commented Jul 10, 2025

r? @sayantn

rustbot has assigned @sayantn.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@folkertdev folkertdev changed the title Streamline c compilation intrinsic-test: streamline c compilation Jul 11, 2025
@folkertdev folkertdev force-pushed the streamline-c-compilation branch from d2a815e to e8d5bc4 Compare July 12, 2025 11:20
Comment on lines 35 to 47
cpp_compiler.command_mut().args([
&format!("--sysroot={cxx_toolchain_dir}/aarch64_be-none-linux-gnu/libc"),
"--include-directory",
&format!("{cxx_toolchain_dir}/aarch64_be-none-linux-gnu/include/c++/14.2.1"),
"--include-directory",
&format!("{cxx_toolchain_dir}/aarch64_be-none-linux-gnu/include/c++/14.2.1/aarch64_be-none-linux-gnu"),
"-L",
&format!("{cxx_toolchain_dir}/lib/gcc/aarch64_be-none-linux-gnu/14.2.1"),
"-L",
&format!("{cxx_toolchain_dir}/aarch64_be-none-linux-gnu/libc/usr/lib"),
"-B",
&format!("{cxx_toolchain_dir}/lib/gcc/aarch64_be-none-linux-gnu/14.2.1"),
]);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So, I got this to work, meaning we can drop the custom linker stuff. I've also reverted the linker change from gcc to g++ for now, it might be needed later but we can change it then.

@folkertdev folkertdev force-pushed the streamline-c-compilation branch from e8d5bc4 to ff7559f Compare July 15, 2025 18:18
@folkertdev
Copy link
Contributor Author

Lmk if this is still too tough to review btw, I could attempt to break it up further.

@sayantn
Copy link
Contributor

sayantn commented Jul 18, 2025

LGTM, just resolve those merge conflicts (just version bump for gcc). Also, shouldn't there be a better way to add the libraries than just hardcoding the librarypath, like at least making the version a parameter?

@folkertdev folkertdev force-pushed the streamline-c-compilation branch from ff7559f to 3735533 Compare July 18, 2025 09:38
@folkertdev folkertdev enabled auto-merge July 18, 2025 09:38
@folkertdev folkertdev added this pull request to the merge queue Jul 18, 2025
Merged via the queue into rust-lang:master with commit c481dd9 Jul 18, 2025
62 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants