From 8ea470f343058ade6f75f16d503a1eb330e1700c Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Thu, 17 Apr 2025 04:28:28 -0400 Subject: [PATCH] Revert "Don't statically link libstdc++ into plugins. Make plugins dynamically link to Rack's libstdc++." This reverts commit e3699b53efba3a7e4280b37a4303e1926da0b262. --- plugin.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugin.mk b/plugin.mk index f98728b7..e2630f67 100644 --- a/plugin.mk +++ b/plugin.mk @@ -32,7 +32,7 @@ ifdef ARCH_LIN # When Rack loads a plugin, it symlinks /tmp/Rack2 to its system dir, so the plugin can link to libRack. LDFLAGS += -Wl,-rpath=/tmp/Rack2 # Since the plugin's compiler could be a different version than Rack's compiler, link libstdc++ and libgcc statically to avoid ABI issues. - LDFLAGS += -static-libgcc + LDFLAGS += -static-libstdc++ -static-libgcc XDG_DATA_HOME ?= $(HOME)/.local/share RACK_USER_DIR ?= $(XDG_DATA_HOME)/Rack2 endif @@ -46,6 +46,7 @@ endif ifdef ARCH_WIN TARGET := $(TARGET).dll + LDFLAGS += -static-libstdc++ RACK_USER_DIR ?= $(LOCALAPPDATA)/Rack2 endif