From 818b727df58685c19d9072154f73f7ad3db023db Mon Sep 17 00:00:00 2001 From: Kimplul Date: Sun, 12 Oct 2025 23:29:32 +0300 Subject: fix compilation on openbsd + Labels require expressions after them when compiled with clang + CFLAGS is predefined by bmake to use DEBUG, remove it since it was kind of pointless anyway + Tests don't yet pass, apparently openbsd disagrees with some of my runtime type decisions --- scripts/makefile | 10 +++------- src/interp.c | 2 +- tests/makefile | 5 ----- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/scripts/makefile b/scripts/makefile index 6e3b972..39ac062 100644 --- a/scripts/makefile +++ b/scripts/makefile @@ -6,12 +6,8 @@ OPTFLAGS != [ "$(RELEASE)" != "0" ] \ LTO ?= 0 LTOFLAGS != [ "$(LTO)" != "0" ] \ - && echo "-flto=auto" - -DEBUG ?= 1 -DEBUGFLAGS != [ "$(DEBUG)" != "0" ] \ - && echo "-DDEBUG=1" \ - || echo "-DNDEBUG=1" + && echo "-flto=auto" \ + || echo DEPFLAGS = -MT $@ -MMD -MP -MF $@.d LINTFLAGS := -fsyntax-only @@ -43,7 +39,7 @@ OBFLAGS := -g WARNFLAGS := -Wall -Wextra COMPILE_FLAGS := $(CFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(LTOFLAGS) \ - $(OBFLAGS) $(DEBUGFLAGS) + $(OBFLAGS) INCLUDE_FLAGS := -I include -I deps/conts/include diff --git a/src/interp.c b/src/interp.c index ad532f2..7fdd4b1 100644 --- a/src/interp.c +++ b/src/interp.c @@ -258,7 +258,7 @@ union interp_ret ejit_run(struct ejit_func *f, size_t paramc, struct ejit_arg pa }; } -top: +top:; union interp_ret retval = {.i = 0}; union fpr { double d; diff --git a/tests/makefile b/tests/makefile index 53115de..2328d0e 100644 --- a/tests/makefile +++ b/tests/makefile @@ -19,11 +19,6 @@ LTO ?= 0 LTOFLAGS != [ "$(LTO)" != "0" ] \ && echo "-flto=auto" -DEBUG ?= 1 -DEBUGFLAGS != [ "$(DEBUG)" != "0" ] \ - && echo "-DDEBUG=1" \ - || echo "-DNDEBUG=1" - OBFLAGS := -g WARNFLAGS := -Wall -Wextra INCLUDE_FLAGS := -I include -- cgit v1.2.3