From d9bcf00f69313b6dd42346d6af340a1a9874ba9f Mon Sep 17 00:00:00 2001 From: Marcus Müller Date: Mon, 16 Jan 2017 15:54:57 +0100 Subject: made FX2 EEPROMS and firmware build with modern SDCC 3.6 --- firmware/fx2/config/CMakeDetermineASM_SDCCCompiler.cmake | 2 +- firmware/fx2/config/Toolchain-sdcc.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'firmware/fx2/config') diff --git a/firmware/fx2/config/CMakeDetermineASM_SDCCCompiler.cmake b/firmware/fx2/config/CMakeDetermineASM_SDCCCompiler.cmake index ab301b9f3..37481077c 100644 --- a/firmware/fx2/config/CMakeDetermineASM_SDCCCompiler.cmake +++ b/firmware/fx2/config/CMakeDetermineASM_SDCCCompiler.cmake @@ -16,7 +16,7 @@ SET(ASM_DIALECT "_SDCC") -SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT asx8051) +SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT sdas8051) INCLUDE(CMakeDetermineASMCompiler) SET(ASM_DIALECT) diff --git a/firmware/fx2/config/Toolchain-sdcc.cmake b/firmware/fx2/config/Toolchain-sdcc.cmake index 733d8f563..f640ae665 100644 --- a/firmware/fx2/config/Toolchain-sdcc.cmake +++ b/firmware/fx2/config/Toolchain-sdcc.cmake @@ -21,7 +21,7 @@ SET(CMAKE_SYSTEM_NAME Generic) SET(CMAKE_C_COMPILER sdcc) # here is where the target environment is located -SET(CMAKE_FIND_ROOT_PATH /usr/bin /usr/share/sdcc) +SET(CMAKE_FIND_ROOT_PATH /usr/bin /usr/share/sdcc /usr/libexec/sdcc) # adjust the default behaviour of the FIND_XXX() commands: # search headers and libraries in the target environment, search -- cgit v1.2.3