Browse Source

Revert "Don't statically link libstdc++ into plugins. Make plugins dynamically link to Rack's libstdc++."

This reverts commit e3699b53ef.
tags/v2.6.4
Andrew Belt 3 weeks ago
parent
commit
8ea470f343
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      plugin.mk

+ 2
- 1
plugin.mk View File

@@ -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. # 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 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. # 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 XDG_DATA_HOME ?= $(HOME)/.local/share
RACK_USER_DIR ?= $(XDG_DATA_HOME)/Rack2 RACK_USER_DIR ?= $(XDG_DATA_HOME)/Rack2
endif endif
@@ -46,6 +46,7 @@ endif


ifdef ARCH_WIN ifdef ARCH_WIN
TARGET := $(TARGET).dll TARGET := $(TARGET).dll
LDFLAGS += -static-libstdc++
RACK_USER_DIR ?= $(LOCALAPPDATA)/Rack2 RACK_USER_DIR ?= $(LOCALAPPDATA)/Rack2
endif endif




Loading…
Cancel
Save