From 1eb2b69a8ee4e4477ef95d73f18ffc4ba760ecd2 Mon Sep 17 00:00:00 2001 From: Laurent Cheylus Date: Wed, 14 Feb 2024 10:59:40 +0100 Subject: [PATCH] build: fix warnings on OpenBSD with clang - Don't use -fstack-clash-protection (argument unused during compilation) - Fix definition for ADDFLAGS/LDFLAGS for -lkvm Signed-off-by: Laurent Cheylus --- Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9af2aa9..03d0d05 100644 --- a/Makefile +++ b/Makefile @@ -91,10 +91,13 @@ $(error $(shell printf "\033[1;91mERROR: \033[97mCompiler too old. (Requires Cla endif #? Any flags added to TESTFLAGS must not contain whitespace for the testing to work -override TESTFLAGS := -fexceptions -fstack-clash-protection -fcf-protection +override TESTFLAGS := -fexceptions -fcf-protection ifneq ($(PLATFORM) $(ARCH),macos arm64) override TESTFLAGS += -fstack-protector endif +ifneq ($(PLATFORM_LC) $(CXX_IS_CLANG),openbsd true) + override TESTFLAGS += -fstack-clash-protection +endif ifeq ($(STATIC),true) ifeq ($(CXX_IS_CLANG) $(CLANG_WORKS),true true) @@ -143,7 +146,11 @@ else ifeq ($(PLATFORM_LC),macos) else ifeq ($(PLATFORM_LC),openbsd) PLATFORM_DIR := openbsd THREADS := $(shell sysctl -n hw.ncpu || echo 1) - override ADDFLAGS += -lkvm -static-libstdc++ + ifeq ($(CXX_IS_CLANG) $(CLANG_WORKS),true true) + override LDFLAGS += -lkvm + else + override ADDFLAGS += -lkvm -static-libstdc++ + endif export MAKE = gmake SU_GROUP := wheel else