From 19b41d86a872d8a3793cf04d4331f2f3e0aba532 Mon Sep 17 00:00:00 2001
From: felix <felix@call-with-current-continuation.org>
Date: Tue, 12 Oct 2021 12:14:32 +0200
Subject: [PATCH] Default to "cc" on BSD systems

OpenBSD uses clang as default system compiler, which causes ABI mismatches
when linking with C++ code. To make integration easier, let's default to
the system compiler on any BSD platform.
---
 Makefile.bsd | 2 ++
 NEWS         | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/Makefile.bsd b/Makefile.bsd
index 91f99331..679b01c3 100644
--- a/Makefile.bsd
+++ b/Makefile.bsd
@@ -30,6 +30,8 @@ SRCDIR ?= ./
 
 ARCH ?= $(shell sh $(SRCDIR)/config-arch.sh)
 
+C_COMPILER ?= cc
+
 # options
 C_COMPILER_OPTIONS ?= -fno-strict-aliasing -fwrapv -DHAVE_CHICKEN_CONFIG_H
 
diff --git a/NEWS b/NEWS
index 110a0329..c993705f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+5.4.0
+
+- Build system
+  - Default "cc" on BSD systems for building CHICKEN to avoid ABI problems
+    when linking with C++ code.
+
 5.3.0rc4
 
 - Compiler
-- 
2.28.0