sw:vec-iree:cmake: Add nano header and library path explicitly Bug: 194706298 Change-Id: I8b01528ffbeff1e86d84977f32101932af8efd69
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3caaac7..1ffe9d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -15,6 +15,12 @@ set(BUILD_RV64_LINUX OFF CACHE BOOL "Build RISC-V 64-bit Linux target (default: OFF)") set(BUILD_INTERNAL_MODELS OFF CACHE BOOL "Build applications from internal models (default: OFF") +# Use nano spec header and libraries. +if(NOT ${BUILD_RV64_LINUX}) + include_directories(BEFORE SYSTEM "${RISCV_TOOLCHAIN_ROOT}/riscv32-unknown-elf/include/newlib-nano/") + link_directories(BEFORE "${RISCV_TOOLCHAIN_ROOT}/riscv32-unknown-elf/lib/newlib-nano/") +endif() + #------------------------------------------------------------------------------- # Springbok-specific settings #-------------------------------------------------------------------------------
diff --git a/cmake/riscv_iree.cmake b/cmake/riscv_iree.cmake index 634ae51..e394851 100644 --- a/cmake/riscv_iree.cmake +++ b/cmake/riscv_iree.cmake
@@ -21,7 +21,7 @@ set(RISCV_TOOLCHAIN_NAME clang) -set(RISCV_TOOLCHAIN_ROOT "$ENV{CACHE}/toolchain_iree" CACHE PATH "RISC-V compiler path") +set(RISCV_TOOLCHAIN_ROOT "$ENV{CACHE}/toolchain_iree_rv32imf" CACHE PATH "RISC-V compiler path") set(CMAKE_FIND_ROOT_PATH ${RISCV_TOOLCHAIN_ROOT}) list(APPEND CMAKE_PREFIX_PATH "${RISCV_TOOLCHAIN_ROOT}")