Merge pull request #158 from RICCIARDI-Adrien/renesas_g4mh_build_fixes

Renesas G4MH build fixes.
TrampolineRTOS · Dec 8, 2023 · d930f94 · d930f94
2 parents b4fea24 + ea08539
commit d930f94
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/goil/templates/build/rh850/g4mh/cmakelists_txt.goilTemplate b/goil/templates/build/rh850/g4mh/cmakelists_txt.goilTemplate
@@ -241,9 +241,6 @@ if OS::SYSTEM_CALL then
 else
 	%	${APP_GENERATED_PATH}/tpl_os.c\n%
 end if
-if [TRANSACTION length] > 0 then
-	%	${APP_GENERATED_PATH}/stm_structure.c\n%
-end if
 if [IOC length] > 0 then
 	%	${APP_GENERATED_PATH}/tpl_ioc_api_config.c\n%
 end if

diff --git a/goil/templates/build/rh850/g4mh/compiler_cmake.goilTemplate b/goil/templates/build/rh850/g4mh/compiler_cmake.goilTemplate
@@ -32,6 +32,6 @@ set(LINKER_SCRIPT % !basePath %machines/rh850/g4mh/rcar_s4.clnk)
 # original rule uses ${CMAKE_C_COMPILER} instead
 set(CMAKE_C_LINK_EXECUTABLE
     "${LINKER} <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -output=<TARGET> -list=<TARGET>.map -subcommand=${LINKER_SCRIPT} <LINK_LIBRARIES>
-	nm -n <TARGET>.abs > <TARGET>.syms
+	bash -c 'nm -n <TARGET>.abs > <TARGET>.syms'
 	${LINKER} <TARGET>.abs -output=<TARGET>.run -form=stype"
 )