fix building on Zephyr 3.7.0

tylerwhall · Sep 10, 2024 · eaa7bc2 · eaa7bc2
1 parent 4559f2e
commit eaa7bc2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Kconfig b/Kconfig
@@ -2,7 +2,7 @@ menuconfig RUST
 	bool "Rust"
 	select THREAD_CUSTOM_DATA
 	select CPLUSPLUS
-	select PICOLIBC_USE_MODULE if PICOLIBC
+    # select PICOLIBC_USE_MODULE if PICOLIBC
 	help
 	  Rust language support.
 

diff --git a/samples/rust-app/prj.conf b/samples/rust-app/prj.conf
@@ -6,3 +6,7 @@ CONFIG_NATIVE_UART_0_ON_OWN_PTY=y
 CONFIG_USERSPACE=y
 CONFIG_QEMU_ICOUNT=n
 CONFIG_LOG=y
+
+# CONFIG_PICOLIBC_USE_TOOLCHAIN is not set
+CONFIG_PICOLIBC_USE_MODULE=y
+CONFIG_STATIC_INIT_GNU=y