@@ -362,7 +362,6 @@ foreach(target armv6m-none-eabi;armv7m-none-eabi;armv7em-none-eabi;armv8m.main-n
362362 set (RUNTIMES_${target} _LIBCXX_ENABLE_SHARED OFF CACHE BOOL "" )
363363 set (RUNTIMES_${target} _LIBCXX_ENABLE_STATIC ON CACHE BOOL "" )
364364 set (RUNTIMES_${target} _LIBCXX_SHARED_OUTPUT_NAME "c++-shared" CACHE STRING "" )
365- set (RUNTIMES_${target} _LIBCXX_LIBC "llvm-libc" CACHE STRING "" )
366365 set (RUNTIMES_${target} _LIBCXX_ENABLE_FILESYSTEM OFF CACHE BOOL "" )
367366 set (RUNTIMES_${target} _LIBCXX_ENABLE_RANDOM_DEVICE OFF CACHE BOOL "" )
368367 set (RUNTIMES_${target} _LIBCXX_ENABLE_LOCALIZATION OFF CACHE BOOL "" )
@@ -376,6 +375,7 @@ foreach(target armv6m-none-eabi;armv7m-none-eabi;armv7em-none-eabi;armv8m.main-n
376375 set (RUNTIMES_${target} _LLVM_INCLUDE_TESTS OFF CACHE BOOL "" )
377376 set (RUNTIMES_${target} _LLVM_ENABLE_ASSERTIONS OFF CACHE BOOL "" )
378377 set (RUNTIMES_${target} _LLVM_ENABLE_RUNTIMES "libc;libcxx" CACHE STRING "" )
378+ set (RUNTIMES_${target} _RUNTIMES_USE_LIBC "llvm-libc" CACHE STRING "" )
379379
380380 # Enable FatLTO for baremetal runtimes
381381 set (RUNTIMES_${target} _LLVM_ENABLE_LTO OFF CACHE BOOL "" )
@@ -417,7 +417,6 @@ foreach(target riscv32-unknown-elf)
417417 set (RUNTIMES_${target} _LIBCXX_ENABLE_SHARED OFF CACHE BOOL "" )
418418 set (RUNTIMES_${target} _LIBCXX_ENABLE_STATIC ON CACHE BOOL "" )
419419 set (RUNTIMES_${target} _LIBCXX_SHARED_OUTPUT_NAME "c++-shared" CACHE STRING "" )
420- set (RUNTIMES_${target} _LIBCXX_LIBC "llvm-libc" CACHE STRING "" )
421420 set (RUNTIMES_${target} _LIBCXX_ENABLE_FILESYSTEM OFF CACHE BOOL "" )
422421 set (RUNTIMES_${target} _LIBCXX_ENABLE_RANDOM_DEVICE OFF CACHE BOOL "" )
423422 set (RUNTIMES_${target} _LIBCXX_ENABLE_LOCALIZATION OFF CACHE BOOL "" )
@@ -431,6 +430,7 @@ foreach(target riscv32-unknown-elf)
431430 set (RUNTIMES_${target} _LLVM_INCLUDE_TESTS OFF CACHE BOOL "" )
432431 set (RUNTIMES_${target} _LLVM_ENABLE_ASSERTIONS OFF CACHE BOOL "" )
433432 set (RUNTIMES_${target} _LLVM_ENABLE_RUNTIMES "libc;libcxx" CACHE STRING "" )
433+ set (RUNTIMES_${target} _RUNTIMES_USE_LIBC "llvm-libc" CACHE STRING "" )
434434
435435 # Enable FatLTO for baremetal runtimes
436436 set (RUNTIMES_${target} _LLVM_ENABLE_LTO OFF CACHE BOOL "" )
0 commit comments