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

Fixed test build on Fedora and Ubuntu with native clang

Browse source
This commit is contained in:
Mark Haslinghuis 2020-10-20 13:09:14 +02:00
parent b582411bcd
commit b88f948004
2 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/test/Makefile
View file

@ -428,6 +428,9 @@ CXX := clang++
#CC := gcc
#CXX := g++
# These flags are needed for clang 10 (maybe even clang 9) to make test work
# -Wno-c99-extensions \
# -Wno-reorder
COMMON_FLAGS = \
-g \
-Wall \
@ -438,11 +441,25 @@ COMMON_FLAGS = \
-O0 \
-DUNIT_TEST \
-isystem $(GTEST_DIR)/inc \
-MMD -MP
-MMD -MP \
-Wno-c99-extensions \
-Wno-reorder
CC_VERSION = $(shell $(CC) -dumpversion)
CXX_VERSION = $(shell $(CXX) -dumpversion)
# Please revisit versions when new clang version arrive. Supported versions: { Linux: 7 - 10; OSX: 7- 12 }
# Travis reports CC_VERSION of 4.2.1
CC_VERSION_MAJOR := $(firstword $(subst ., ,$(CC_VERSION)))
CC_VERSION_CHECK_MIN := 4
CC_VERSION_CHECK_MAX := 10
ifdef MACOSX
CC_VERSION_CHECK_MAX := 12
endif
ifeq ($(shell expr $(CC_VERSION_MAJOR) \< $(CC_VERSION_CHECK_MIN) \| $(CC_VERSION_MAJOR) \> $(CC_VERSION_CHECK_MAX)),1)
$(error $(CC) $(CC_VERSION) is not supported. On most systems the correct compiler will be available as 'clang-10' and 'clang++-10, but Betaflight invokes 'clang' and 'clang++' to accommodate some operating systems that do not have proper clang compilers available. Please modify your system so that an appropriate version of clang is invoked as 'clang' and 'clang++'.)
endif
ifeq ($(shell $(CC) -v 2>&1 | grep -q "clang version" && echo "clang"),clang)
COMMON_FLAGS += -fblocks
ifndef CYGWIN