Hi! On 2023-09-20T13:59:53+0200, Arthur Cohen <arthur.co...@embecosm.com> wrote: > From: Pierre-Emmanuel Patry <pierre-emmanuel.pa...@embecosm.com> > > Define the libgrust directory as a host compilation module as well as > for targets.
> --- a/Makefile.def > +++ b/Makefile.def > @@ -149,6 +149,7 @@ host_modules= { module= libcc1; > extra_configure_flags=--enable-shared; }; > host_modules= { module= gotools; }; > host_modules= { module= libctf; bootstrap=true; }; > host_modules= { module= libsframe; bootstrap=true; }; > +host_modules= { module= libgrust; }; > > target_modules = { module= libstdc++-v3; > bootstrap=true; > @@ -192,6 +193,7 @@ target_modules = { module= libgm2; lib_path=.libs; }; > target_modules = { module= libgomp; bootstrap= true; lib_path=.libs; }; > target_modules = { module= libitm; lib_path=.libs; }; > target_modules = { module= libatomic; bootstrap=true; lib_path=.libs; }; > +target_modules = { module= libgrust; }; > > // These are (some of) the make targets to be done in each subdirectory. > // Not all; these are the ones which don't have special options. Maybe just I am confused, but to make sure that the build doesn't break for different GCC configurations, don't we also directly need to incorporate here a few GCC/Rust master branch follow-on commits, like: - commit 171ea4e2b3e202067c50f9c206974fbe1da691c0 "fixup: Fix bootstrap build" - commit 61cbe201029658c32e5c360823b9a1a17d21b03c "fixup: Fix missing build dependency" - commit 6a8b207b9ef7f9038e0cae7766117428783825d8 "libgrust: Add dependency to libstdc++" (Not sure if all of these are necessary and/or if that's the complete list; haven't looked up the corresponding GCC/Rust GitHub PRs.) > --- a/gcc/rust/config-lang.in > +++ b/gcc/rust/config-lang.in > +target_libs="target-libffi target-libbacktrace target-libgrust" Please don't add back 'target-libffi' and 'target-libbacktrace' here; just 'target-libgrust'. (As is present in GCC/Rust master branch, and per commit 7411eca498beb13729cc2acec77e68250940aa81 "Rust: Don't depend on unused 'target-libffi', 'target-libbacktrace'".) Grüße Thomas ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955