[Scummvm-git-logs] scummvm master -> 0974f168b204b26f620d2a7e1a55021e66309e64

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0974f168b2 BUILD: Use unmodified SAVED_LDFLAGS from env for linking plugins.


Commit: 0974f168b204b26f620d2a7e1a55021e66309e64
    https://github.com/scummvm/scummvm/commit/0974f168b204b26f620d2a7e1a55021e66309e64
Author: Björn Esser (besser82 at fedoraproject.org)
Date: 2020-02-23T00:57:39+01:00

Commit Message:
BUILD: Use unmodified SAVED_LDFLAGS from env for linking plugins.

In commit dce6b012 we added the LDFLAGS, which were modified by the
configure script, to the linker stage of the plugins.  Doing so turns
out not to work well for all system architectures.

This approach uses the unmodified LDFLAGS, stored in the SAVED_LDFLAGS
variable by the configure script, from the system environment for
linking dynamic plugins, which is very likely not to cause any harm.

Changed paths:
    rules.mk


diff --git a/rules.mk b/rules.mk
index 1138c8b..b793ea4 100644
--- a/rules.mk
+++ b/rules.mk
@@ -47,7 +47,7 @@ ifdef PLUGIN
 PLUGIN-$(MODULE) := plugins/$(PLUGIN_PREFIX)$(notdir $(MODULE))$(PLUGIN_SUFFIX)
 $(PLUGIN-$(MODULE)): $(MODULE_OBJS-$(MODULE)) $(PLUGIN_EXTRA_DEPS)
 	$(QUIET)$(MKDIR) plugins
-	$(QUIET_PLUGIN)$(CXX) $(filter-out $(PLUGIN_EXTRA_DEPS),$+) $(PLUGIN_LDFLAGS) -o $@
+	$(QUIET_PLUGIN)$(CXX) $(SAVED_LDFLAGS) $(filter-out $(PLUGIN_EXTRA_DEPS),$+) $(PLUGIN_LDFLAGS) -o $@
 
 # Reset PLUGIN var
 PLUGIN:=