Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-13 19:40:31 +03:00
Code Issues Wiki Activity

Fix clang version (#13099) (#13114)

Browse source
This commit is contained in:
Mark Haslinghuis 2023-10-21 14:33:37 +02:00 • committed by GitHub
parent 4b410bd4cc
commit 7257c920c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View file

@ -75,7 +75,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install dependencies - name: Install dependencies
run: sudo apt-get install -y libblocksruntime-dev run: sudo apt-get install -y libblocksruntime-dev clang-12
- name: Run sanity checks - name: Run sanity checks
run: make EXTRA_FLAGS=-Werror checks run: make EXTRA_FLAGS=-Werror checks

5
src/test/Makefile
View file

@ -477,12 +477,13 @@ GTEST_DIR = ../../lib/test/gtest
CC := clang-12 CC := clang-12
CXX := clang++-12 CXX := clang++-12
ifneq ($(OSFAMILY), linux)
ifeq ($(shell which $(CC) 2>/dev/null),) ifeq ($(shell which $(CC) 2>/dev/null),)
$(info Falling back to 'clang'.) $(info Falling back to 'clang' on Windows and OSX.)
CC := clang CC := clang
CXX := clang++ CXX := clang++
endif endif
endif
#CC := gcc #CC := gcc
#CXX := g++ #CXX := g++