Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-15 04:15:44 +03:00
Code Issues Wiki Activity

Merge pull request #10403 from haslinghuis/make-tests-with-clang11-linux

Browse source
This commit is contained in:
Michael Keller 2020-12-15 22:19:12 +01:00 • committed by GitHub
commit d36c62d092
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/test/Makefile
View file

@ -435,9 +435,9 @@ endif
#CC := gcc #CC := gcc
#CXX := g++ #CXX := g++
# These flags are needed for clang 10 (maybe even clang 9) to make test work # These flags are needed for clang 10 (linux / MacOS) to make test work:
# -Wno-c99-extensions \ # -Wno-c99-extensions
# -Wno-reorder # -Wno-reorder
COMMON_FLAGS = \ COMMON_FLAGS = \
-g \ -g \
@ -458,11 +458,24 @@ CXX_VERSION = $(shell $(CXX) -dumpversion)
ifeq ($(shell $(CC) -v 2>&1 | grep -q "clang version" && echo "clang"),clang) ifeq ($(shell $(CC) -v 2>&1 | grep -q "clang version" && echo "clang"),clang)
# Please revisit versions when new clang version arrive. Supported versions: { Linux: 7 - 10; OSX: 7- 12 } # Please revisit versions when new clang version arrive. Supported versions: { Linux: 7 - 11; OSX: 7- 12 }
# Travis reports CC_VERSION of 4.2.1 # Travis reports CC_VERSION of 4.2.1
CC_VERSION_MAJOR := $(firstword $(subst ., ,$(CC_VERSION))) CC_VERSION_MAJOR := $(firstword $(subst ., ,$(CC_VERSION)))
CC_VERSION_CHECK_MIN := 7 CC_VERSION_CHECK_MIN := 7
CC_VERSION_CHECK_MAX := 10 CC_VERSION_CHECK_MAX := 11
# Added flags for clang 11 (linux) are not backwards compatible:
# -fcommon
# -Wno-void-pointer-to-int-cast
ifneq ($(OSFAMILY), macosx)
ifeq ($(CC_VERSION_MAJOR), 11)
COMMON_FLAGS += \
-fcommon \
-Wno-void-pointer-to-int-cast
endif
endif
ifeq ($(OSFAMILY), macosx) ifeq ($(OSFAMILY), macosx)
# MacOS comes with Apple's own flavour of clang that does not adhere to the official versioning # MacOS comes with Apple's own flavour of clang that does not adhere to the official versioning
CC_VERSION_CHECK_MAX := 12 CC_VERSION_CHECK_MAX := 12