Skip to content

Commit 40d0b70

Browse files
committed
Corregido error en la generacion de los flag del compilador
1 parent cb80656 commit 40d0b70

File tree

2 files changed

+35
-46
lines changed

2 files changed

+35
-46
lines changed

Modules/Platform/MicrochipMCU-C-XC32.cmake

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -70,48 +70,4 @@ set(CMAKE_CXX_COMPILER_FORCED ON)
7070

7171
if(CMAKE_C_COMPILER)
7272
_xc32_get_version()
73-
74-
set(link_flags "")
75-
set(compile_flags "")
76-
77-
list(APPEND compile_flags
78-
"-mprocessor=${MICROCHIP_MCU_MODEL}"
79-
)
80-
string(APPEND link_flags
81-
" -mprocessor=${MICROCHIP_MCU_MODEL}"
82-
)
83-
if(MICROCHIP_LINK_SCRIPT OR MICROCHIP_MIN_HEAP_SIZE)
84-
string(APPEND link_flags
85-
" -Wl"
86-
)
87-
if(MICROCHIP_LINK_SCRIPT)
88-
string(APPEND link_flags
89-
",--script=\"${MICROCHIP_LINK_SCRIPT}\""
90-
)
91-
endif()
92-
if(MICROCHIP_MIN_HEAP_SIZE)
93-
string(APPEND link_flags
94-
",--defsym=_min_heap_size=${MICROCHIP_MIN_HEAP_SIZE}"
95-
)
96-
endif()
97-
if(MICROCHIP_MAP_FILE)
98-
string(APPEND link_flags
99-
",-Map=\"${MICROCHIP_MAP_FILE}\""
100-
)
101-
set_property(DIRECTORY APPEND
102-
PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
103-
"${MICROCHIP_MAP_FILE}"
104-
)
105-
endif()
106-
endif()
10773
endif()
108-
109-
add_compile_options(
110-
${compile_flags}
111-
)
112-
string(APPEND CMAKE_C_LINK_FLAGS
113-
${link_flags}
114-
)
115-
#message(STATUS ${CMAKE_C_LINK_FLAGS})
116-
set(MICROCHIP_C_LINK_FLAGS ${link_flags} CACHE STRING "link flag cached")
117-
set(MICROCHIP_C_COMPILE_FLAGS ${compile_flags} CACHE STRING "compile flag cached")

toolchain.cmake

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,43 @@ endif()
128128
#En caso de estar ya configurado el compilador, restauro los flags
129129
message(STATUS "microchip toolchain")
130130
if(MICROCHIP_XC32_PATH)
131+
set(link_flags "")
132+
set(compile_flags "")
133+
134+
list(APPEND compile_flags
135+
"-mprocessor=${MICROCHIP_MCU_MODEL}"
136+
)
137+
string(APPEND link_flags
138+
" -mprocessor=${MICROCHIP_MCU_MODEL}"
139+
)
140+
if(MICROCHIP_LINK_SCRIPT OR MICROCHIP_MIN_HEAP_SIZE)
141+
string(APPEND link_flags
142+
" -Wl"
143+
)
144+
if(MICROCHIP_LINK_SCRIPT)
145+
string(APPEND link_flags
146+
",--script=\"${MICROCHIP_LINK_SCRIPT}\""
147+
)
148+
endif()
149+
if(MICROCHIP_MIN_HEAP_SIZE)
150+
string(APPEND link_flags
151+
",--defsym=_min_heap_size=${MICROCHIP_MIN_HEAP_SIZE}"
152+
)
153+
endif()
154+
if(MICROCHIP_MAP_FILE)
155+
string(APPEND link_flags
156+
",-Map=\"${MICROCHIP_MAP_FILE}\""
157+
)
158+
set_property(DIRECTORY APPEND
159+
PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
160+
"${MICROCHIP_MAP_FILE}"
161+
)
162+
endif()
163+
endif()
131164
string(APPEND CMAKE_C_LINK_FLAGS
132-
${MICROCHIP_C_LINK_FLAGS}
165+
${link_flags}
133166
)
134167
add_compile_options(
135-
${MICROCHIP_C_COMPILE_FLAGS}
168+
${compile_flags}
136169
)
137170
endif()

0 commit comments

Comments
 (0)