From a6cf59734eef8c2a6393dee9b6b420f3b8fff04f Mon Sep 17 00:00:00 2001
From: Thomas Nilefalk <thomas@nilefalk.se>
Date: Sun, 25 Apr 2021 15:44:00 +0200
Subject: [PATCH] [build] Add iconv to LDLIBS

---
 compiler/Makefile.Cygwin         |   3 ++-
 compiler/Makefile.Darwin         |   2 +-
 compiler/Makefile.local.template |   2 +-
 regression/platforms/Cygwin.a3c  | Bin 48889 -> 48889 bytes
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/compiler/Makefile.Cygwin b/compiler/Makefile.Cygwin
index 56923d62e..381b9aa86 100644
--- a/compiler/Makefile.Cygwin
+++ b/compiler/Makefile.Cygwin
@@ -11,8 +11,9 @@ include Makefile.win32
 # Sharable libraries have .dll extension
 SOEXTENSION = dll
 
-# Flags to send to compiler
+# Flags to send to compiler and linker
 CFLAGS += -funsigned-char
+LDLIBS += -liconv
 
 # If Cgreen is installed correctly and completely theses things should just work
 # Otherwise you can try to set them to something that does work
diff --git a/compiler/Makefile.Darwin b/compiler/Makefile.Darwin
index d97ace291..45ccf4a98 100644
--- a/compiler/Makefile.Darwin
+++ b/compiler/Makefile.Darwin
@@ -5,7 +5,7 @@ include ../mk/include_guard.mk
 #
 
 CFLAGS += -funsigned-char -Wno-invalid-source-encoding
-LDFLAGS += -liconv
+LDLIBS += -liconv
 
 # Sharable libraries extension
 SOEXTENSION = dylib
diff --git a/compiler/Makefile.local.template b/compiler/Makefile.local.template
index ade4a5f04..c79830c0f 100644
--- a/compiler/Makefile.local.template
+++ b/compiler/Makefile.local.template
@@ -16,4 +16,4 @@ winalan: CC=i686-w64-mingw32-gcc # or possibly just "gcc"
 winalan: WINDRES=i686-w64-mingw32-windres # or possibly just "windres"
 
 # We might need to locate -lcgreen
-linked_unittests isolated_unittests: LDLIBS = -L/usr/local/lib
+linked_unittests isolated_unittests: LDLIBS += -L/usr/local/lib
diff --git a/regression/platforms/Cygwin.a3c b/regression/platforms/Cygwin.a3c
index 86c786b845ab79b64c8215d1334323d5b080b14e..54bdb9097bdd69034d9372f9ea1b4e7c55010fbd 100644
GIT binary patch
delta 1006
zcmezQm+9wUCLTv0M?Yo;jwA*K#?2FX)-lCT*|<kCTbMPqfB^zrK-B;Lr!Gw1s3ko4
zceWl*IsY8oa*J`uJ;`yzYMw<dcJUq@;tz0$o8)0Prvr!h9US5Y`Pj{A!6AMFhqz7w
zc5@nVh+n}Wu2G2HoEjYB7jTHH6k#`~0*Ck+9O4Sa*v%=yA$|gfxJ(Ila|&>XAHg9m
zQHtH1930{YaEObPVK*lOhxi^G;sWK^%}K!_z5|CiPX%^!KzXyc0&D);yrsg`4FHho
B7HI$g

delta 1006
zcmezQm+9wUCLTv0M?Yo;jwA*KhGi3Z)-eUhY}_N6EzH^d0Vu-2;PzAjOau9oH);t_
z{++FdQ_epJx7=bJa!+y`v6^R*i(R}2hxh{=;wE|6&FR1)eg}uRK|XeKT5yQpz#*<v
zfZd!19O74Sh-(yLH>U=N_yru|Dn;1MslXwA28XypF?MrGaEPD4Audyb-JAj(;zw|Z
zOO#?aCkKc40UY8YW!TNhz#+Z|hqypFc5_m2i0{B5&QpQi98lgYuE3iAHgBnLbprs+
C&<0!p