Uniform gcc-avr => avr-gcc for consistency
parent
911b1c5e69
commit
392298c3da
|
|
@ -7,7 +7,7 @@ Run `./utils/bootstrap.py`
|
|||
- clang-format-9.0.0-noext
|
||||
- cmake-3.22.5
|
||||
- ninja-1.10.2
|
||||
- gcc-avr-7.3.0
|
||||
- avr-gcc-7.3.0
|
||||
|
||||
## How to build the preliminary project so far:
|
||||
Now the process is the same as in the Buddy Firmware:
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
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/gcc-avr-${AVR_GCC_VERSION}/")
|
||||
set(AVR_TOOLCHAIN_DIR "${PROJECT_CMAKE_DIR}/../.dependencies/avr-gcc-${AVR_GCC_VERSION}/")
|
||||
|
||||
include("${PROJECT_CMAKE_DIR}/AnyAvrGcc.cmake")
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ endif()
|
|||
function(get_recommended_gcc_version var)
|
||||
execute_process(
|
||||
COMMAND "${Python3_EXECUTABLE}" "${PROJECT_ROOT_DIR}/utils/bootstrap.py"
|
||||
"--print-dependency-version" "gcc-avr"
|
||||
"--print-dependency-version" "avr-gcc"
|
||||
OUTPUT_VARIABLE RECOMMENDED_VERSION
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
RESULT_VARIABLE RETVAL
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ dependencies = {
|
|||
'Darwin': 'https://github.com/Kitware/CMake/releases/download/v3.22.5/cmake-3.22.5-macos-universal.tar.gz',
|
||||
},
|
||||
},
|
||||
'gcc-avr': {
|
||||
'avr-gcc': {
|
||||
'version': '7.3.0',
|
||||
'url': {
|
||||
'Linux': 'https://ww1.microchip.com/downloads/aemDocuments/documents/DEV/ProductDocuments/SoftwareTools/avr8-gnu-toolchain-3.7.0.1796-linux.any.x86_64.tar.gz',
|
||||
|
|
|
|||
|
|
@ -69,7 +69,6 @@ class BuildType(Enum):
|
|||
|
||||
|
||||
class BuildConfiguration(ABC):
|
||||
|
||||
@abstractmethod
|
||||
def get_cmake_cache_entries(self):
|
||||
"""Convert the build configuration to CMake cache entries."""
|
||||
|
|
@ -87,7 +86,6 @@ class BuildConfiguration(ABC):
|
|||
|
||||
|
||||
class FirmwareBuildConfiguration(BuildConfiguration):
|
||||
|
||||
def __init__(self,
|
||||
build_type: BuildType,
|
||||
toolchain: Path = None,
|
||||
|
|
@ -115,7 +113,7 @@ class FirmwareBuildConfiguration(BuildConfiguration):
|
|||
entries.extend([
|
||||
('CMAKE_MAKE_PROGRAM', 'FILEPATH', str(get_dependency('ninja'))),
|
||||
('CMAKE_TOOLCHAIN_FILE', 'FILEPATH', str(self.toolchain)),
|
||||
('AVR_TOOLCHAIN_DIR', 'DIRPATH', str(get_dependency('gcc-avr'))),
|
||||
('AVR_TOOLCHAIN_DIR', 'DIRPATH', str(get_dependency('avr-gcc'))),
|
||||
('CMAKE_BUILD_TYPE', 'STRING', self.build_type.value.title()),
|
||||
('PROJECT_VERSION_SUFFIX', 'STRING', self.version_suffix or ''),
|
||||
('PROJECT_VERSION_SUFFIX_SHORT', 'STRING',
|
||||
|
|
|
|||
Loading…
Reference in New Issue