Skip to content

Commit

Permalink
Fix clang version (betaflight#13099)
Browse files Browse the repository at this point in the history
  • Loading branch information
haslinghuis authored Sep 29, 2023
1 parent 66bf029 commit 63f5065
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
- uses: actions/checkout@v3

- 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
run: make EXTRA_FLAGS=-Werror checks
Expand Down
5 changes: 3 additions & 2 deletions src/test/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -483,12 +483,13 @@ GTEST_DIR = ../../lib/test/gtest

CC := clang-12
CXX := clang++-12
ifneq ($(OSFAMILY), linux)
ifeq ($(shell which $(CC) 2>/dev/null),)
$(info Falling back to 'clang'.)
$(info Falling back to 'clang' on Windows and OSX.)
CC := clang
CXX := clang++
endif

endif
#CC := gcc
#CXX := g++

Expand Down

0 comments on commit 63f5065

Please sign in to comment.