| Message ID | 20220911232844.680121-1-raj.khem@gmail.com |
|---|---|
| State | Accepted, archived |
| Commit | 521872ab2cac092c88446730772cb8c4e22b0cdc |
| Headers | show |
| Series | [v3] rust: Use libc++ runtime when using clang with llvm runtime | expand |
On Sun, 2022-09-11 at 16:28 -0700, Khem Raj wrote: > meta-clang has options when it comes to C++ runtime, default is to use > gnu runtime, other options are llvm runtime and android runtime. This > patch helps when a distro is using llvm runtime for C/C++ runtime. It > informs the rust build system about right C++ runtime to configure for > when such a setting is used. > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > v2: Rebase now that 1.63 is in > v3: Use renamed variable RUNTIME -> TC_CXX_RUNTIME > > meta/recipes-devtools/rust/rust.inc | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/meta/recipes-devtools/rust/rust.inc b/meta/recipes-devtools/rust/rust.inc > index a33eb00e25..4e78b5ea6f 100644 > --- a/meta/recipes-devtools/rust/rust.inc > +++ b/meta/recipes-devtools/rust/rust.inc > @@ -110,6 +110,8 @@ python do_configure() { > # [llvm] > config.add_section("llvm") > config.set("llvm", "static-libstdcpp", e(False)) > + if "llvm" in (d.getVar('TC_CXX_RUNTIME', True) or ""): > + config.set("llvm", "use-libcxx", e(True)) > > # [rust] > config.add_section("rust") We can drop the True from the getVar as expansion is the default. Cheers, Richard
diff --git a/meta/recipes-devtools/rust/rust.inc b/meta/recipes-devtools/rust/rust.inc index a33eb00e25..4e78b5ea6f 100644 --- a/meta/recipes-devtools/rust/rust.inc +++ b/meta/recipes-devtools/rust/rust.inc @@ -110,6 +110,8 @@ python do_configure() { # [llvm] config.add_section("llvm") config.set("llvm", "static-libstdcpp", e(False)) + if "llvm" in (d.getVar('TC_CXX_RUNTIME', True) or ""): + config.set("llvm", "use-libcxx", e(True)) # [rust] config.add_section("rust")
meta-clang has options when it comes to C++ runtime, default is to use gnu runtime, other options are llvm runtime and android runtime. This patch helps when a distro is using llvm runtime for C/C++ runtime. It informs the rust build system about right C++ runtime to configure for when such a setting is used. Signed-off-by: Khem Raj <raj.khem@gmail.com> --- v2: Rebase now that 1.63 is in v3: Use renamed variable RUNTIME -> TC_CXX_RUNTIME meta/recipes-devtools/rust/rust.inc | 2 ++ 1 file changed, 2 insertions(+)