diff --git a/cmake/riscv_baremetal.cmake b/cmake/riscv_baremetal.cmake
index 4b290e2..49d6950 100644
--- a/cmake/riscv_baremetal.cmake
+++ b/cmake/riscv_baremetal.cmake
@@ -39,10 +39,13 @@
      set(CMAKE_STRIP "${RISCV_TOOLCHAIN_ROOT}/llvm-strip")
 
      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -menable-experimental-extensions -march=${CMAKE_SYSTEM_PROCESSOR}  -mabi=${CMAKE_SYSTEM_ABI}")
+     # Use Nano header and libraries.
+     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")
 else()
      set(CMAKE_SYSTEM_PROCESSOR rv32imv)
 
-     set(RISCV_TOOLCHAIN_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../cache/toolchain_vp/bin CACHE STRING "RISC-V toolchain path")
+     set(RISCV_TOOLCHAIN_ROOT "$ENV{CACHE}/toolchain_vp/bin" CACHE STRING "RISC-V toolchain path")
      message (STATUS "RISC-V toolchain path is ${RISCV_TOOLCHAIN_ROOT}")
      find_file( RISCV_COMPILER "riscv32-unknown-elf-gcc" HINTS ${RISCV_TOOLCHAIN_ROOT} PATHS ENV INCLUDE)