Use llvm clang tools on macOS and explicitly install it on Linux

Author: marcoroth

.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install dependencies
-        run: sudo apt-get install check
+        run: sudo apt-get install check clang-19
 
       - name: make
         run: make
@@ -44,10 +44,10 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install clang-tidy
-        run: sudo apt-get install -y clang-tidy
+        run: sudo apt-get install -y clang-tidy-19
 
       - name: clang-tidy version
-        run: clang-tidy --version
+        run: clang-tidy-19 --version
 
       - name: Tidy
         run: bin/tidy

Brewfile

@@ -1,3 +1,2 @@
 brew "check"
-brew "clang-format"
-brew "llvm" # for clang and clang-tidy
+brew "llvm@19" # for clang, clang-format and clang-tidy

Makefile

@@ -27,39 +27,38 @@ flags = -g -Wall -fPIC
 ifeq ($(os),Linux)
   test_cflags = $(flags) -I/usr/include/check
   test_ldflags = -L/usr/lib/x86_64-linux-gnu -lcheck -lm -lsubunit
-  llvm_path = TODO
-  cc = clang
+  cc = clang-19
   clang_format = clang-format-19
-  clang_tidy = clang-tidy
+  clang_tidy = clang-tidy-19
 endif
 
 ifeq ($(os),Darwin)
   brew_prefix := $(shell brew --prefix check)
   test_cflags = $(flags) -I$(brew_prefix)/include
   test_ldflags = -L$(brew_prefix)/lib -lcheck -lm
-  llvm_path = /opt/homebrew/opt/llvm
+  llvm_path = $(shell brew --prefix llvm@19)
   cc = $(llvm_path)/bin/clang
-  clang_format = clang-format
+  clang_format = $(llvm_path)/bin/clang-format
   clang_tidy = $(llvm_path)/bin/clang-tidy
 endif
 
 all: $(exec) $(lib_name) test
 
 $(exec): $(objects)
-	gcc $(objects) $(flags) -o $(exec)
+	$(cc) $(objects) $(flags) -o $(exec)
 
 $(lib_name): $(objects)
-	gcc -shared $(objects) $(flags) -o $(lib_name)
+	$(cc) -shared $(objects) $(flags) -o $(lib_name)
 	# cp $(lib_name) $(ruby_extension)
 
 %.o: %.c include/%.h
-	gcc -c $(flags) $< -o $@
+	$(cc) -c $(flags) $< -o $@
 
 test/%.o: test/%.c
-	gcc -c $(test_cflags) $< -o $@
+	$(cc) -c $(test_cflags) $< -o $@
 
 test: $(test_objects) $(non_main_objects)
-	gcc $(test_objects) $(non_main_objects) $(test_cflags) $(test_ldflags) -o $(test_exec)
+	$(cc) $(test_objects) $(non_main_objects) $(test_cflags) $(test_ldflags) -o $(test_exec)
 
 clean:
 	rm -f $(exec) $(test_exec) $(lib_name) $(ruby_extension)

README.md

@@ -6,23 +6,25 @@ Seamless Parsing for HTML, ERB, and more.
 
 This project builds the ERBX program and its associated unit tests using a Makefile for automation. The Makefile provides several useful commands for compiling, running tests, and cleaning the project.
 
-### Requirements
+### Building
 
-- **GCC**
-- **Check**: The project uses the [Check](https://libcheck.github.io/check/) library for unit testing.
-- **Clang Format**: The project uses [Clang Format](https://clang.llvm.org/docs/ClangFormat.html) for formatting.
-- **Clang Tidy**: The project uses [Clang Format](https://clang.llvm.org/docs/ClangFormat.html) for formatting.
+#### Requirements
 
-For Linux:
+- [**Check**](https://libcheck.github.io/check/): For unit testing.
+- [**Clang 19**](https://clang.llvm.org): The compiler used to build this project.
+- [**Clang Format 19**](https://clang.llvm.org/docs/ClangFormat.html): For formatting the project.
+- [**Clang Tidy 19**](https://clang.llvm.org/extra/clang-tidy/): For linting the project.
+
+**For Linux:**
 ```bash
-sudo apt-get install check clang-format-19 clang-tidy
+sudo apt-get install check clang-19 clang-tidy-19 clang-format-19
 ```
 
-For macOS (using Homebrew):
+**For macOS (using Homebrew):**
 ```bash
-brew install check clang-format llvm
-# or
 brew bundle
+# or
+brew install check llvm@19
 ```
 
 ### Commands