From 7a3327b093bc69cfda9704f86f7e7d4e11b7ff18 Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Sun, 18 Jun 2023 19:30:00 +0200
Subject: [PATCH] Do not prescribe static build of libraries

This allows the linker to search for either `libwabt.so` or `libwabt.a` in the
search path `WABT_LIB_DIR`, depending on what is installed in the system.
---
 src/standalone/Makefile      |  3 ++-
 src/standalone/wabt/Makefile |  3 ++-
 src/waforthc/Makefile        | 14 +++++++-------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/standalone/Makefile b/src/standalone/Makefile
index e703e9f..583da49 100644
--- a/src/standalone/Makefile
+++ b/src/standalone/Makefile
@@ -71,7 +71,8 @@ package: waforth
 
 endif
 CFLAGS:= -I$(WASMTIME_DIR)/include $(CFLAGS)
-LIBS:=$(WASMTIME_DIR)/lib/libwasmtime.a $(LIBS)
+LIBS:=-lwasmtime $(LIBS)
+LDFLAGS := -L$(WASMTIME_DIR)/lib $(LDFLAGS)
 endif
 
 ifeq ($(DEBUG),1)
diff --git a/src/standalone/wabt/Makefile b/src/standalone/wabt/Makefile
index 0abe9be..86c61c5 100644
--- a/src/standalone/wabt/Makefile
+++ b/src/standalone/wabt/Makefile
@@ -32,7 +32,8 @@ endif
 WABT_INCLUDE_DIR := $(WABT_DIR)/include
 WABT_LIB_DIR := $(WABT_DIR)/lib
 CXXFLAGS:= -I$(WABT_INCLUDE_DIR) $(CXXFLAGS)
-LIBS:=$(WABT_LIB_DIR)/libwabt.a $(LIBS)
+LIBS:=-lwabt $(LIBS)
+LDFLAGS := $(LDFLAGS) -L$(WABT_LIB_DIR)
 
 ifeq ($(DEBUG),1)
 CXXFLAGS := $(CXXFLAGS) -g
diff --git a/src/waforthc/Makefile b/src/waforthc/Makefile
index a652344..db94465 100644
--- a/src/waforthc/Makefile
+++ b/src/waforthc/Makefile
@@ -32,9 +32,10 @@ WABT_DATA_DIR = $(WABT_DIR)/share/wabt
 LIBS := -mmacosx-version-min=13.0 
 else # $(UNAME_S)
 GCC_TARGET_MACHINE = $(shell gcc -dumpmachine)
-WABT_INCLUDE_DIR ?= /usr/lib/include
-WABT_LIB_DIR ?= /usr/lib/$(GCC_TARGET_MACHINE)
-WABT_DATA_DIR ?= /usr/share/wabt
+WABT_DIR ?= /usr
+WABT_INCLUDE_DIR ?= $(WABT_DIR)/include
+WABT_LIB_DIR ?= $(WABT_DIR)/lib/$(GCC_TARGET_MACHINE)
+WABT_DATA_DIR ?= $(WABT_DIR)/share/wabt
 PACKAGE_SUFFIX=x86_64-linux
 endif # $(UNAME_S)
 package: waforthc
@@ -42,9 +43,8 @@ package: waforthc
 endif # $(OS)
 
 CXXFLAGS := -DVERSION='"$(VERSION)"' -Wall -std=c++17 -I$(WABT_INCLUDE_DIR) $(CXXFLAGS)
-LIBS := \
-	$(WABT_LIB_DIR)/libwabt.a \
-	$(LIBS)
+LIBS := -lwabt $(LIBS)
+LDFLAGS := -L$(WABT_LIB_DIR)
 
 ifeq ($(DEBUG),1)
 CXXFLAGS := $(CXXFLAGS) -g
@@ -67,7 +67,7 @@ OBJECTS := waforthc.o
 all: waforthc
 
 waforthc: $(OBJECTS)
-	$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
+	$(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
 
 waforthc.o: waforth_core.h waforth_rt.h waforth_wabt_wasm-rt-impl_c.h waforth_wabt_wasm-rt-impl_h.h waforth_wabt_wasm-rt_h.h