aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGyorgy Szing <Gyorgy.Szing@arm.com>2021-03-09 07:30:34 +0100
committerGyörgy Szing <gyorgy.szing@arm.com>2021-03-11 10:59:23 +0100
commitdaf2efdaa780a7963a84f89ced5892bd936d32ec (patch)
tree97b02f7953ebb455fff49602659afae97407284e
parent345686a8b5dffb3742ec51ccfc18bab7bbee59d5 (diff)
downloadtrusted-services-daf2efdaa780a7963a84f89ced5892bd936d32ec.tar.gz
Fix: "arm-linux" builds allow wrong GCC compiler
Change d80f856adf59 introduced a bug. It makes deployments targeting the "arm-linux" environment accept non Linux specific GCC binaries like "aarch64-none-elf-gcc". Since these GCC builds are not bundled with a standard library built with Linux support, compilation errors arise due to missing Linux kernel headers. In addition this change fixes the GCC prefix triplet list for the “opeesp” environment and allows using GCC built with “aarch64-none-linux“ triplet. Change-Id: Ideff9f53dfe9080cd0ba24f75279a81532badb04 Signed-off-by: Gyorgy Szing <Gyorgy.Szing@arm.com>
-rw-r--r--environments/arm-linux/default_toolchain_file.cmake2
-rw-r--r--environments/opteesp/default_toolchain_file.cmake2
2 files changed, 2 insertions, 2 deletions
diff --git a/environments/arm-linux/default_toolchain_file.cmake b/environments/arm-linux/default_toolchain_file.cmake
index 5ad7801..d530b0d 100644
--- a/environments/arm-linux/default_toolchain_file.cmake
+++ b/environments/arm-linux/default_toolchain_file.cmake
@@ -5,7 +5,7 @@
#
#-------------------------------------------------------------------------------
if(NOT CROSS_COMPILE AND NOT DEFINED ENV{CROSS_COMPILE})
- set(CROSS_COMPILE "aarch64-elf-;aarch64-none-elf-;aarch64-linux-gnu-" CACHE STRING "List of GCC prefix triplets to use.")
+ set(CROSS_COMPILE "aarch64-linux-gnu-;aarch64-none-linux-gnu-" CACHE STRING "List of GCC prefix triplets to use.")
endif()
set(CMAKE_CROSSCOMPILING True)
diff --git a/environments/opteesp/default_toolchain_file.cmake b/environments/opteesp/default_toolchain_file.cmake
index 76109ca..7cec0e4 100644
--- a/environments/opteesp/default_toolchain_file.cmake
+++ b/environments/opteesp/default_toolchain_file.cmake
@@ -7,7 +7,7 @@
#GNUARM v8 and v9 compilers use a different triplet.
if(NOT CROSS_COMPILE AND NOT DEFINED ENV{CROSS_COMPILE})
- set(CROSS_COMPILE "aarch64-elf-;aarch64-none-elf-;aarch64-linux-gnu-" CACHE STRING "List of GCC prefix triplets to use.")
+ set(CROSS_COMPILE "aarch64-elf-;aarch64-none-elf-;aarch64-linux-gnu-;aarch64-none-linux-gnu-" CACHE STRING "List of GCC prefix triplets to use.")
endif()
set(CMAKE_CROSSCOMPILING True)