From a0c622ca99888f6cc00b9ca59c354eb16b1dda12 Mon Sep 17 00:00:00 2001
From: Yuri D'Elia <wavexx@thregr.org>
Date: Sun, 16 Oct 2022 14:33:14 +0200
Subject: [PATCH] cmake: Uniform Avr toolchain build with MK3

- Also set AR/RANLIB in the toolchain
- Fetch GCC version from bootstrap
---
 cmake/AnyAvrGcc.cmake | 10 ++++++++++
 cmake/AvrGcc.cmake    |  6 ++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/cmake/AnyAvrGcc.cmake b/cmake/AnyAvrGcc.cmake
index de36ceb..656a35e 100644
--- a/cmake/AnyAvrGcc.cmake
+++ b/cmake/AnyAvrGcc.cmake
@@ -72,6 +72,16 @@ set(CMAKE_ASM_COMPILE_OBJECT
     CACHE STRING "" FORCE
     )
 
+set(CMAKE_AR
+    "${BINUTILS_PATH}/${TOOLCHAIN_PREFIX}gcc-ar${EXECUTABLE_SUFFIX}"
+    CACHE FILEPATH "ar" FORCE
+    )
+
+set(CMAKE_RANLIB
+    "${BINUTILS_PATH}/${TOOLCHAIN_PREFIX}gcc-ranlib${EXECUTABLE_SUFFIX}"
+    CACHE FILEPATH "ranlib" FORCE
+    )
+
 set(CMAKE_OBJCOPY
     "${BINUTILS_PATH}/${TOOLCHAIN_PREFIX}objcopy${EXECUTABLE_SUFFIX}"
     CACHE INTERNAL "objcopy tool"
diff --git a/cmake/AvrGcc.cmake b/cmake/AvrGcc.cmake
index 741e961..c9d8eb1 100644
--- a/cmake/AvrGcc.cmake
+++ b/cmake/AvrGcc.cmake
@@ -1,6 +1,4 @@
 get_filename_component(PROJECT_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" DIRECTORY)
-
-set(AVR_GCC_VERSION 7.3.0)
-set(AVR_TOOLCHAIN_DIR "${PROJECT_CMAKE_DIR}/../.dependencies/avr-gcc-${AVR_GCC_VERSION}/")
-
+include("${PROJECT_CMAKE_DIR}/Utilities.cmake")
+get_dependency_directory("avr-gcc" AVR_TOOLCHAIN_DIR)
 include("${PROJECT_CMAKE_DIR}/AnyAvrGcc.cmake")