From 81ac6e4249991afe9d5b9bf81a678bebfb083467 Mon Sep 17 00:00:00 2001 From: Kaius Ruokonen Date: Sat, 27 Jul 2024 04:04:30 +0300 Subject: [PATCH 1/5] Update ccpp.yml --- .github/workflows/ccpp.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 36232f0..9b569ed 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -16,11 +16,7 @@ jobs: with: fetch-depth: 1 submodules: true - - name: Install Clang 15 - run: | - export HOMEBREW_NO_INSTALL_CLEANUP=TRUE - brew install --force llvm - name: make - run: make OS=Github - - name: make test - run: make test OS=Github + run: make + - name: make run_tests + run: make run_tests From 86483f74a637da92dcb3eb312c24b7c663346ce4 Mon Sep 17 00:00:00 2001 From: Kaius Ruokonen Date: Sat, 27 Jul 2024 04:05:39 +0300 Subject: [PATCH 2/5] Update Makefile --- Makefile | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index d883564..2aeebbb 100644 --- a/Makefile +++ b/Makefile @@ -13,25 +13,21 @@ OS = $(shell uname -s) endif ifeq ($(OS),Linux) -CC = /usr/lib/llvm-18/bin/clang -CXX = /usr/lib/llvm-18/bin/clang++ -CXXFLAGS = -pthread -I/usr/lib/llvm-18/include/c++/v1 -LDFLAGS = -lc++ -L/usr/lib/llvm-18/lib/c++ +CC := /usr/lib/llvm-18/bin/clang +CXX := /usr/lib/llvm-18/bin/clang++ +CXXFLAGS = -pthread -I/usr/local/include +LDFLAGS = -L/usr/local/lib +CXXFLAGS += -std=c++23 endif ifeq ($(OS),Darwin) -CC = /opt/homebrew/opt/llvm/bin/clang -CXX = /opt/homebrew/opt/llvm/bin/clang++ -CXXFLAGS =-I/opt/homebrew/opt/llvm/include/c++/v1 -Ofast -LDFLAGS = -L/opt/homebrew/opt/llvm/lib/c++ -Wl,-rpath,/opt/homebrew/opt/llvm/lib/c++ -Ofast +CC := /Library/Developer/CommandLineTools/usr/bin/clang +CXX := /Library/Developer/CommandLineTools/usr/bin/clang++ +CXXFLAGS = -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk +CXXFLAGS += -std=c++2b endif -ifeq ($(OS),Github) -CC = /usr/local/opt/llvm/bin/clang -CXX = /usr/local/opt/llvm/bin/clang++ -CXXFLAGS = -I/usr/local/opt/llvm/include/ -I/usr/local/opt/llvm/include/c++/v1 -LDFLAGS = -L/usr/local/opt/llvm/lib/c++ -Wl,-rpath,/usr/local/opt/llvm/lib/c++ -endif +CXXFLAGS += -stdlib=libc++ -Wall -Wextra CXXFLAGS += -std=c++23 -stdlib=libc++ CXXFLAGS += -Wall -Wextra -Wno-reserved-module-identifier -Wno-deprecated-declarations @@ -182,4 +178,4 @@ mostlyclean: .PHONY: dump dump: $(foreach v, $(sort $(.VARIABLES)), $(if $(filter file,$(origin $(v))), $(info $(v)=$($(v))))) - @echo '' \ No newline at end of file + @echo '' From f9e6e12a6c634dc95ccd050e64302a9b097968cf Mon Sep 17 00:00:00 2001 From: Kaius Ruokonen Date: Sat, 27 Jul 2024 04:10:06 +0300 Subject: [PATCH 3/5] Update Makefile --- Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 2aeebbb..eaf5c64 100644 --- a/Makefile +++ b/Makefile @@ -27,10 +27,8 @@ CXXFLAGS = -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk CXXFLAGS += -std=c++2b endif -CXXFLAGS += -stdlib=libc++ -Wall -Wextra - -CXXFLAGS += -std=c++23 -stdlib=libc++ -CXXFLAGS += -Wall -Wextra -Wno-reserved-module-identifier -Wno-deprecated-declarations +CXXFLAGS += -std=c++23 -stdlib=libc++ -Wall -Wextra +CXXFLAGS += -Wno-reserved-module-identifier -Wno-deprecated-declarations CXXFLAGS += -I$(sourcedir) LDFLAGS += -fuse-ld=lld From 2db8795c5dce2d2594badfba463043f2a447624a Mon Sep 17 00:00:00 2001 From: Kaius Ruokonen Date: Sat, 27 Jul 2024 04:12:38 +0300 Subject: [PATCH 4/5] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index eaf5c64..3871613 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ CXXFLAGS = -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk CXXFLAGS += -std=c++2b endif -CXXFLAGS += -std=c++23 -stdlib=libc++ -Wall -Wextra +CXXFLAGS += -stdlib=libc++ -Wall -Wextra CXXFLAGS += -Wno-reserved-module-identifier -Wno-deprecated-declarations CXXFLAGS += -I$(sourcedir) LDFLAGS += -fuse-ld=lld From bc6b1539b49edf7dffc1fa7dcd001fea120cca12 Mon Sep 17 00:00:00 2001 From: Kaius Ruokonen Date: Sat, 27 Jul 2024 04:14:06 +0300 Subject: [PATCH 5/5] Update Makefile --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3871613..848804b 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ CC := /usr/lib/llvm-18/bin/clang CXX := /usr/lib/llvm-18/bin/clang++ CXXFLAGS = -pthread -I/usr/local/include LDFLAGS = -L/usr/local/lib -CXXFLAGS += -std=c++23 +CXXFLAGS += -std=c++23 -Wno-reserved-module-identifier endif ifeq ($(OS),Darwin) @@ -28,7 +28,7 @@ CXXFLAGS += -std=c++2b endif CXXFLAGS += -stdlib=libc++ -Wall -Wextra -CXXFLAGS += -Wno-reserved-module-identifier -Wno-deprecated-declarations +CXXFLAGS += -Wno-deprecated-declarations CXXFLAGS += -I$(sourcedir) LDFLAGS += -fuse-ld=lld