From e93a52a267b7649d92da13aa4b035cbaf4079eee Mon Sep 17 00:00:00 2001 From: Delyan Angelov Date: Thu, 8 Apr 2021 19:17:04 +0300 Subject: [PATCH] builtin: add support for '-d static_boehm -gc boehm' (only for macos and linux for now) --- vlib/builtin/builtin_d_gcboehm.v | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/vlib/builtin/builtin_d_gcboehm.v b/vlib/builtin/builtin_d_gcboehm.v index 8860239ae8..c29699568b 100644 --- a/vlib/builtin/builtin_d_gcboehm.v +++ b/vlib/builtin/builtin_d_gcboehm.v @@ -2,19 +2,31 @@ module builtin #define GC_THREADS 1 -$if windows { - #flag -I@VROOT/thirdparty/libgc/include - #flag -L@VROOT/thirdparty/libgc -} -$if macos { - #pkgconfig bdw-gc +$if static_boehm ? { + $if macos { + #flag -I/opt/homebrew/include + #flag /opt/homebrew/lib/libgc.a + } $else $if linux { + #flag -l:libgc.a + } $else { + #flag -lgc + } +} $else { + $if macos { + #pkgconfig bdw-gc + } + $if windows { + #flag -I@VROOT/thirdparty/libgc/include + #flag -L@VROOT/thirdparty/libgc + } + #flag -lgc } + $if gcboehm_leak ? { #define GC_DEBUG } -#include -#flag -lgc +#include // replacements for `malloc()/calloc()`, `realloc()` and `free()` // for use with Boehm-GC