From 8e40481022506bec558b35730d7f8b11eaad7349 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Thu, 21 Apr 2022 16:48:35 +0200
Subject: [PATCH] Use dynamic_boehm everywhere

---
 .woodpecker/.build_experimental.yml | 19 -------------------
 Makefile                            |  6 +++---
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/.woodpecker/.build_experimental.yml b/.woodpecker/.build_experimental.yml
index 3968e05..0129d2b 100644
--- a/.woodpecker/.build_experimental.yml
+++ b/.woodpecker/.build_experimental.yml
@@ -27,22 +27,3 @@ pipeline:
       - du -h suvieter
     when:
       event: push
-
-  dynamic-boehm-prod:
-    image: 'chewingbever/vlang:latest'
-    pull: true
-    group: 'build'
-    environment:
-      - LDFLAGS=-lz -lbz2 -llzma -lexpat -lzstd -llz4 -static
-      - VFLAGS=-cc gcc -d dynamic_boehm
-    commands:
-      - make prod
-      # Make sure the binary is actually statically built
-      - readelf -d pvieter
-      - du -h pvieter
-      - '[ "$(readelf -d pvieter | grep NEEDED | wc -l)" = 0 ]'
-      # This removes so much, it's amazing
-      - strip -s pvieter
-      - du -h pvieter
-    when:
-      event: push
diff --git a/Makefile b/Makefile
index 5480124..b9f369a 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ SRC_DIR := src
 SOURCES != find '$(SRC_DIR)' -iname '*.v'
 
 V_PATH ?= v
-V := $(V_PATH) -showcc -gc boehm
+V := $(V_PATH) -showcc -gc boehm -d dynamic_boehm
 
 all: vieter
 
@@ -12,7 +12,7 @@ all: vieter
 # We force the boehm gc to be compiled dynamically because otherwise, our CI
 # build breaks.
 vieter: $(SOURCES)
-	$(V) -d dynamic_boehm -g -o vieter $(SRC_DIR)
+	$(V) -g -o vieter $(SRC_DIR)
 
 # Debug build using gcc
 # The debug build can't use the boehm garbage collector, as that is
@@ -66,7 +66,7 @@ vet:
 
 .PHONY: test
 test:
-	$(V) -d dynamic_boehm test $(SRC_DIR)
+	$(V) test $(SRC_DIR)
 
 # Build & patch the V compiler
 .PHONY: v