# Merge remote-tracking branch 'origin/master' into llvm11 · gitcafe/zig

[View on GitCafe](https://git.cafe/gitcafe/zig/commit/b5a36f676b1fd69f195d9f1eb6e35f3eb2f15946)

Repository: [gitcafe/zig](https://git.cafe/gitcafe/zig)

Visibility: public

Requested revision: b5a36f676b1fd69f195d9f1eb6e35f3eb2f15946

Requested commit: b5a36f676b1fd69f195d9f1eb6e35f3eb2f15946

Commit: b5a36f676b1fd69f195d9f1eb6e35f3eb2f15946

Tree: 92ce1ffa64bc2d32d5ef73dce66daf3c8e893ee6

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge remote-tracking branch 'origin/master' into llvm11

Conflicts:
  cmake/Findllvm.cmake

The llvm11 branch changed 10's to 11's and master branch added the
"using LLVM_CONFIG_EXE" help message, so the resolution was to merge
these changes together.

I also added a check to make sure LLVM is built with AVR enabled, which
is no longer an experimental target.

```

## Parents

- [d6d05fc84d33c71434a1f8bae51ca5956e08cdf0](https://git.cafe/gitcafe/zig/commit/d6d05fc84d33c71434a1f8bae51ca5956e08cdf0?format=markdown)

- [f2d374e8465042fa5cb6bf2be7b9b086948f3a94](https://git.cafe/gitcafe/zig/commit/f2d374e8465042fa5cb6bf2be7b9b086948f3a94?format=markdown)

[Source at this commit](https://git.cafe/gitcafe/zig/tree/b5a36f676b1fd69f195d9f1eb6e35f3eb2f15946?format=markdown)