Fix variable name conflict with toolchain file

multiplemonomials · multiplemonomials · commit f07c0cd7e669 · 2020-12-03T10:58:41.000-08:00
diff --git a/tools/cmake/profiles/debug.cmake b/tools/cmake/profiles/debug.cmake
@@ -6,33 +6,33 @@ function(mbed_set_profile_options target mbed_toolchain)
     set(profile_link_options "")
 
     if(${mbed_toolchain} STREQUAL "GCC_ARM")
-        list(APPEND c_compile_options
+        list(APPEND profile_c_compile_options
             "-c"
             "-Og"
         )
         target_compile_options(${target}
             INTERFACE
-                $<$<COMPILE_LANGUAGE:C>:${c_compile_options}>
+                $<$<COMPILE_LANGUAGE:C>:${profile_c_compile_options}>
         )
 
-        list(APPEND cxx_compile_options
+        list(APPEND profile_cxx_compile_options
             "-c"
             "-fno-rtti"
             "-Wvla"
             "-Og"
         )
         target_compile_options(${target}
             INTERFACE
-                $<$<COMPILE_LANGUAGE:CXX>:${cxx_compile_options}>
+                $<$<COMPILE_LANGUAGE:CXX>:${profile_cxx_compile_options}>
         )
 
-        list(APPEND asm_compile_options
+        list(APPEND profile_asm_compile_options
             "-c"
             "-x" "assembler-with-cpp"
         )
         target_compile_options(${target}
             INTERFACE
-                $<$<COMPILE_LANGUAGE:ASM>:${asm_compile_options}>
+                $<$<COMPILE_LANGUAGE:ASM>:${profile_asm_compile_options}>
         )
 
         list(APPEND profile_link_options
@@ -48,22 +48,22 @@ function(mbed_set_profile_options target mbed_toolchain)
             "-Wl,-n"
         )
     elseif(${mbed_toolchain} STREQUAL "ARM")
-        list(APPEND c_compile_options
+        list(APPEND profile_c_compile_options
             "-O1"
         )
         target_compile_options(${target}
             INTERFACE
-                $<$<COMPILE_LANGUAGE:C>:${c_compile_options}>
+                $<$<COMPILE_LANGUAGE:C>:${profile_c_compile_options}>
         )
 
-        list(APPEND cxx_compile_options
+        list(APPEND profile_cxx_compile_options
             "-fno-rtti"
             "-fno-c++-static-destructors"
             "-O1"
         )
         target_compile_options(${target}
             INTERFACE
-                $<$<COMPILE_LANGUAGE:CXX>:${cxx_compile_options}>
+                $<$<COMPILE_LANGUAGE:CXX>:${profile_cxx_compile_options}>
         )
 
         list(APPEND link_options
diff --git a/tools/cmake/profiles/develop.cmake b/tools/cmake/profiles/develop.cmake
@@ -6,31 +6,31 @@ function(mbed_set_profile_options target mbed_toolchain)
     set(profile_link_options "")
 
     if(${mbed_toolchain} STREQUAL "GCC_ARM")
-        list(APPEND c_compile_options
+        list(APPEND profile_c_compile_options
             "-c"
             "-Os"
         )
         target_compile_options(${target}
             INTERFACE
-                $<$<COMPILE_LANGUAGE:C>:${c_compile_options}>
+                $<$<COMPILE_LANGUAGE:C>:${profile_c_compile_options}>
         )
 
-        list(APPEND cxx_compile_options
+        list(APPEND profile_cxx_compile_options
             "-fno-rtti"
             "-Wvla"
             "-Os"
         )
         target_compile_options(${target}
             INTERFACE
-                $<$<COMPILE_LANGUAGE:CXX>:${cxx_compile_options}>
+                $<$<COMPILE_LANGUAGE:CXX>:${profile_cxx_compile_options}>
         )
 
-        list(APPEND asm_compile_options
+        list(APPEND profile_asm_compile_options
             "-x" "assembler-with-cpp"
         )
         target_compile_options(${target}
             INTERFACE
-                $<$<COMPILE_LANGUAGE:ASM>:${asm_compile_options}>
+                $<$<COMPILE_LANGUAGE:ASM>:${profile_asm_compile_options}>
         )
 
         list(APPEND profile_link_options
@@ -46,22 +46,22 @@ function(mbed_set_profile_options target mbed_toolchain)
             "-Wl,-n"
         )
     elseif(${mbed_toolchain} STREQUAL "ARM")
-        list(APPEND c_compile_options
+        list(APPEND profile_c_compile_options
             "-Os"
         )
         target_compile_options(${target}
             INTERFACE
-                $<$<COMPILE_LANGUAGE:C>:${c_compile_options}>
+                $<$<COMPILE_LANGUAGE:C>:${profile_c_compile_options}>
         )
 
-        list(APPEND cxx_compile_options
+        list(APPEND profile_cxx_compile_options
             "-fno-rtti"
             "-fno-c++-static-destructors"
             "-Os"
         )
         target_compile_options(${target}
             INTERFACE
-                $<$<COMPILE_LANGUAGE:CXX>:${cxx_compile_options}>
+                $<$<COMPILE_LANGUAGE:CXX>:${profile_cxx_compile_options}>
         )
 
         list(APPEND profile_link_options
diff --git a/tools/cmake/profiles/release.cmake b/tools/cmake/profiles/release.cmake
@@ -6,33 +6,33 @@ function(mbed_set_profile_options target mbed_toolchain)
     set(profile_link_options "")
 
     if(${mbed_toolchain} STREQUAL "GCC_ARM")
-        list(APPEND c_compile_options
+        list(APPEND profile_c_compile_options
             "-c"
             "-Os"
         )
         target_compile_options(${target}
             INTERFACE
-                $<$<COMPILE_LANGUAGE:C>:${c_compile_options}>
+                $<$<COMPILE_LANGUAGE:C>:${profile_c_compile_options}>
         )
 
-        list(APPEND cxx_compile_options
+        list(APPEND profile_cxx_compile_options
             "-c"
             "-fno-rtti"
             "-Wvla"
             "-Os"
         )
         target_compile_options(${target}
             INTERFACE
-                $<$<COMPILE_LANGUAGE:CXX>:${cxx_compile_options}>
+                $<$<COMPILE_LANGUAGE:CXX>:${profile_cxx_compile_options}>
         )
 
-        list(APPEND asm_compile_options
+        list(APPEND profile_asm_compile_options
             "-c"
             "-x" "assembler-with-cpp"
         )
         target_compile_options(${target}
             INTERFACE
-                $<$<COMPILE_LANGUAGE:ASM>:${asm_compile_options}>
+                $<$<COMPILE_LANGUAGE:ASM>:${profile_asm_compile_options}>
         )
 
         list(APPEND profile_link_options
@@ -48,22 +48,22 @@ function(mbed_set_profile_options target mbed_toolchain)
             "-Wl,-n"
         )
     elseif(${mbed_toolchain} STREQUAL "ARM")
-        list(APPEND c_compile_options
+        list(APPEND profile_c_compile_options
             "-Oz"
         )
         target_compile_options(${target}
             INTERFACE
-                $<$<COMPILE_LANGUAGE:C>:${c_compile_options}>
+                $<$<COMPILE_LANGUAGE:C>:${profile_c_compile_options}>
         )
 
-        list(APPEND cxx_compile_options
+        list(APPEND profile_cxx_compile_options
             "-fno-rtti"
             "-fno-c++-static-destructors"
             "-Oz"
         )
         target_compile_options(${target}
             INTERFACE
-                $<$<COMPILE_LANGUAGE:CXX>:${cxx_compile_options}>
+                $<$<COMPILE_LANGUAGE:CXX>:${profile_cxx_compile_options}>
         )
 
         list(APPEND profile_link_options

Original file line number	Diff line number	Diff line change
`@@ -6,31 +6,31 @@ function(mbed_set_profile_options target mbed_toolchain)`
`6`	`6`	`set(profile_link_options "")`
`7`	`7`
`8`	`8`	`if(${mbed_toolchain} STREQUAL "GCC_ARM")`
`9`		`- list(APPEND c_compile_options`
	`9`	`+ list(APPEND profile_c_compile_options`
`10`	`10`	`"-c"`
`11`	`11`	`"-Os"`
`12`	`12`	`)`
`13`	`13`	`target_compile_options(${target}`
`14`	`14`	`INTERFACE`
`15`		`- $<$<COMPILE_LANGUAGE:C>:${c_compile_options}>`
	`15`	`+ $<$<COMPILE_LANGUAGE:C>:${profile_c_compile_options}>`
`16`	`16`	`)`
`17`	`17`
`18`		`- list(APPEND cxx_compile_options`
	`18`	`+ list(APPEND profile_cxx_compile_options`
`19`	`19`	`"-fno-rtti"`
`20`	`20`	`"-Wvla"`
`21`	`21`	`"-Os"`
`22`	`22`	`)`
`23`	`23`	`target_compile_options(${target}`
`24`	`24`	`INTERFACE`
`25`		`- $<$<COMPILE_LANGUAGE:CXX>:${cxx_compile_options}>`
	`25`	`+ $<$<COMPILE_LANGUAGE:CXX>:${profile_cxx_compile_options}>`
`26`	`26`	`)`
`27`	`27`
`28`		`- list(APPEND asm_compile_options`
	`28`	`+ list(APPEND profile_asm_compile_options`
`29`	`29`	`"-x" "assembler-with-cpp"`
`30`	`30`	`)`
`31`	`31`	`target_compile_options(${target}`
`32`	`32`	`INTERFACE`
`33`		`- $<$<COMPILE_LANGUAGE:ASM>:${asm_compile_options}>`
	`33`	`+ $<$<COMPILE_LANGUAGE:ASM>:${profile_asm_compile_options}>`
`34`	`34`	`)`
`35`	`35`
`36`	`36`	`list(APPEND profile_link_options`
`@@ -46,22 +46,22 @@ function(mbed_set_profile_options target mbed_toolchain)`
`46`	`46`	`"-Wl,-n"`
`47`	`47`	`)`
`48`	`48`	`elseif(${mbed_toolchain} STREQUAL "ARM")`
`49`		`- list(APPEND c_compile_options`
	`49`	`+ list(APPEND profile_c_compile_options`
`50`	`50`	`"-Os"`
`51`	`51`	`)`
`52`	`52`	`target_compile_options(${target}`
`53`	`53`	`INTERFACE`
`54`		`- $<$<COMPILE_LANGUAGE:C>:${c_compile_options}>`
	`54`	`+ $<$<COMPILE_LANGUAGE:C>:${profile_c_compile_options}>`
`55`	`55`	`)`
`56`	`56`
`57`		`- list(APPEND cxx_compile_options`
	`57`	`+ list(APPEND profile_cxx_compile_options`
`58`	`58`	`"-fno-rtti"`
`59`	`59`	`"-fno-c++-static-destructors"`
`60`	`60`	`"-Os"`
`61`	`61`	`)`
`62`	`62`	`target_compile_options(${target}`
`63`	`63`	`INTERFACE`
`64`		`- $<$<COMPILE_LANGUAGE:CXX>:${cxx_compile_options}>`
	`64`	`+ $<$<COMPILE_LANGUAGE:CXX>:${profile_cxx_compile_options}>`
`65`	`65`	`)`
`66`	`66`
`67`	`67`	`list(APPEND profile_link_options`