From 8b215d86fbc49cdc9449ec86299fdae587e31386 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Mon, 18 Jan 2021 09:34:36 -0500 Subject: [PATCH] Don't link libstdc++ statically on Mac because it uses libc++ instead. --- plugin.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugin.mk b/plugin.mk index 3d5ba611..180e746e 100644 --- a/plugin.mk +++ b/plugin.mk @@ -20,9 +20,6 @@ FLAGS += -I$(RACK_DIR)/include -I$(RACK_DIR)/dep/include LDFLAGS += -shared LDFLAGS += -L$(RACK_DIR) -lRack -# Since the compiler we're using could have a newer version than the minimum supported libstdc++ version, link it statically. -LDFLAGS += -static-libstdc++ - include $(RACK_DIR)/arch.mk ifdef ARCH_LIN @@ -31,6 +28,8 @@ ifdef ARCH_LIN # I don't really understand the side effects (see GCC manual), but so far tests are positive. FLAGS += -fno-gnu-unique LDFLAGS += -Wl,-rpath=. + # Since the compiler we're using could have a newer version than the minimum supported libstdc++ version, link it statically. + LDFLAGS += -static-libstdc++ RACK_USER_DIR ?= $(HOME)/.Rack endif @@ -42,6 +41,7 @@ endif ifdef ARCH_WIN TARGET := plugin.dll + LDFLAGS += -static-libstdc++ RACK_USER_DIR ?= "$(USERPROFILE)"/Documents/Rack endif