From 0e8a2cf05c97c3d00e265bf6c33699f92e2014b4 Mon Sep 17 00:00:00 2001 From: Matthew Date: Mon, 16 Dec 2019 17:33:14 +1100 Subject: [PATCH] Remove unnecessary variables in toolchain files Setting `-target` flag explicitly is unnecessary. Whenever this needs to be explicitly passed through, the coompiler id should be checked. Changes to the musl build system makes the explicit `C_COMPILER` variable useless. --- gcc.cmake | 1 - llvm.cmake | 4 ---- 2 files changed, 5 deletions(-) diff --git a/gcc.cmake b/gcc.cmake index 302d403c2..9261b38d3 100644 --- a/gcc.cmake +++ b/gcc.cmake @@ -89,7 +89,6 @@ if("${CROSS_COMPILER_PREFIX}" STREQUAL "") endif() set(CMAKE_C_COMPILER ${CROSS_COMPILER_PREFIX}gcc) -set(C_COMPILER gcc) set(CMAKE_ASM_COMPILER ${CROSS_COMPILER_PREFIX}gcc) set(CMAKE_CXX_COMPILER ${CROSS_COMPILER_PREFIX}g++) diff --git a/llvm.cmake b/llvm.cmake index da6852cfb..64707bda0 100644 --- a/llvm.cmake +++ b/llvm.cmake @@ -18,17 +18,14 @@ set(CMAKE_SYSTEM_NAME Generic) set(CMAKE_SYSTEM_PROCESSOR seL4CPU) set(LLVM_TOOLCHAIN ON) -set(TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/llvm.cmake") set(CMAKE_ASM_COMPILER "clang") set(CMAKE_ASM_COMPILER_ID Clang) set(CMAKE_ASM_COMPILER_TARGET ${TRIPLE}) string(APPEND asm_common_flags " -Wno-unused-command-line-argument") -string(APPEND asm_common_flags " -target ${TRIPLE}") set(CMAKE_C_COMPILER "clang") -set(C_COMPILER "clang") set(CMAKE_C_COMPILER_ID Clang) set(CMAKE_C_COMPILER_TARGET ${TRIPLE}) @@ -38,7 +35,6 @@ set(CMAKE_CXX_COMPILER_TARGET ${TRIPLE}) string(APPEND c_common_flags " -Qunused-arguments") string(APPEND c_common_flags " -Wno-constant-logical-operand") -string(APPEND c_common_flags " -target ${TRIPLE}") set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)