Skip to contentSkip to conversation

rust: Use libc++ runtime when using clang with llvm runtime

PATCH Superseded Khem Raj 2 participants 3 messages Aug 22, 2022

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 rust: Use libc++ runtime when using clang with llvm runtime

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.

---
 meta/recipes-devtools/rust/rust.inc | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-devtools/rust/rust.inc +3 -0
index 284347dedc..c288903c9b 100644
@@ -73,6 +73,7 @@ python do_configure() {
 
     # [target.ARCH-poky-linux]
     host_section = "target.{}".format(d.getVar('RUST_HOST_SYS', True))
+    runtime = "target.{}".format(d.getVar('RUNTIME', True))
     config.add_section(host_section)
 
     llvm_config_target = d.expand("${RUST_ALTERNATE_EXE_PATH}")
@@ -107,6 +108,8 @@ python do_configure() {
     # [llvm]
     config.add_section("llvm")
     config.set("llvm", "static-libstdcpp", e(False))
+    if "llvm" in runtime:
+        config.set("llvm", "use-libcxx", e(True))
 
     # [rust]
     config.add_section("rust")
Signature · 1 line
2.37.2
#1 lore raw
Quoted 24 lines · Khem Raj

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.

---
 meta/recipes-devtools/rust/rust.inc | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-devtools/rust/rust.inc +1 -0
index 284347dedc..c288903c9b 100644
@@ -73,6 +73,7 @@ python do_configure() {
 
     # [target.ARCH-poky-linux]
     host_section = "target.{}".format(d.getVar('RUST_HOST_SYS', True))
+    runtime = "target.{}".format(d.getVar('RUNTIME', True))
     config.add_section(host_section)
 
     llvm_config_target = d.expand("${RUST_ALTERNATE_EXE_PATH}")

meta/recipes-devtools/rust/rust.inc python do_configure() { · line 113

Quoted 6 lines
meta/recipes-devtools/rust/rust.inc +2 -0
@@ -107,6 +108,8 @@ python do_configure() {
     # [llvm]
     config.add_section("llvm")
     config.set("llvm", "static-libstdcpp", e(False))
+    if "llvm" in runtime:
+        config.set("llvm", "use-libcxx", e(True))
 

I think it is a little bit over complicated, couldn't it just be:

if "llvm" in (d.getVar('RUNTIME', True) or ""):

    config.set("llvm", "use-libcxx", e(True))

I'd much rather we did some kind of indirection via a variable too since I'm not sure OE-Core knows anything about RUNTIME, or that RUNTIME is a particularly good choice of name for the core.

Cheers,

Richard

author
#2 lore raw
Quoted 35 lines · Richard Purdie
Quoted 24 lines · Khem Raj

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.

---
 meta/recipes-devtools/rust/rust.inc | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-devtools/rust/rust.inc +1 -0
index 284347dedc..c288903c9b 100644
@@ -73,6 +73,7 @@ python do_configure() {
 
     # [target.ARCH-poky-linux]
     host_section = "target.{}".format(d.getVar('RUST_HOST_SYS', True))
+    runtime = "target.{}".format(d.getVar('RUNTIME', True))
     config.add_section(host_section)
 
     llvm_config_target = d.expand("${RUST_ALTERNATE_EXE_PATH}")

meta/recipes-devtools/rust/rust.inc python do_configure() { · line 113

Quoted 6 lines
meta/recipes-devtools/rust/rust.inc +2 -0
@@ -107,6 +108,8 @@ python do_configure() {
     # [llvm]
     config.add_section("llvm")
     config.set("llvm", "static-libstdcpp", e(False))
+    if "llvm" in runtime:
+        config.set("llvm", "use-libcxx", e(True))
 

I think it is a little bit over complicated, couldn't it just be:

Quoted 3 lines

if "llvm" in (d.getVar('RUNTIME', True) or ""):

    config.set("llvm", "use-libcxx", e(True))

OK. I have pushed this into yoe/mut on contrib and testing it. I think it will work ok.

Quoted 4 lines

I'd much rather we did some kind of indirection via a variable too since I'm not sure OE-Core knows anything about RUNTIME, or that RUNTIME is a particularly good choice of name for the core.

Thats fine, I am not vested in name as much, although it might be used in other places too by now. but if we were to have a convention in OE-core which is different
thats one time bullet to bite.
I think we have few bugs open in bugzilla

https://bugzilla.yoctoproject.org/show_bug.cgi?id=11528
https://bugzilla.yoctoproject.org/show_bug.cgi?id=9417

which attempt to bring various portions of toolchain options into core. We have been
postponing it for quite a while. if we want to consider it something for next LTS, this
would be right time to start.

Quoted 3 lines

Cheers,

Richard