[Scummvm-git-logs] scummvm branch-2-6 -> a2f12d5788206f55fb5b67245eae9a38431a6a9d

[lephilousophe]

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

Summary:
8e6b6a5e67 PLUGINS: Fix PLUGIN_LDFLAGS value inherited from environment
a2f12d5788 RISCOS: Add LDFLAGS to plugins too


Commit: 8e6b6a5e67233a3db79f8c83e3f1368f0eff553a
    https://github.com/scummvm/scummvm/commit/8e6b6a5e67233a3db79f8c83e3f1368f0eff553a
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-06-18T18:23:58+02:00

Commit Message:
PLUGINS: Fix PLUGIN_LDFLAGS value inherited from environment

It was not always taken into account because lines in _mak_plugins were
overwriting it

Changed paths:
    configure


diff --git a/configure b/configure
index 284b9d5178a..bb7a928cb5d 100755
--- a/configure
+++ b/configure
@@ -4137,7 +4137,7 @@ POST_OBJS_FLAGS :=
 		append_var DEFINES "-DUNCACHED_PLUGINS"
 _mak_plugins='
 PLUGIN_EXTRA_DEPS	= $(abspath $(srcdir)/backends/platform/dc/plugin.x $(srcdir)/backends/platform/dc/plugin.syms) $(EXECUTABLE) backends/platform/dc/plugin_head.o
-PLUGIN_LDFLAGS		= -ml -m4-single-only -nostartfiles -Wl,-q,-T$(srcdir)/backends/platform/dc/plugin.x,--just-symbols,$(EXECUTABLE),--retain-symbols-file,$(srcdir)/backends/platform/dc/plugin.syms backends/platform/dc/plugin_head.o
+PLUGIN_LDFLAGS		+= -ml -m4-single-only -nostartfiles -Wl,-q,-T$(srcdir)/backends/platform/dc/plugin.x,--just-symbols,$(EXECUTABLE),--retain-symbols-file,$(srcdir)/backends/platform/dc/plugin.syms backends/platform/dc/plugin_head.o
 PRE_OBJS_FLAGS		:= -Wl,--whole-archive
 POST_OBJS_FLAGS		:= -Wl,--no-whole-archive
 '
@@ -4225,7 +4225,7 @@ POST_OBJS_FLAGS := -Wl,-no-whole-archive
 		_plugin_suffix=".dll"
 _mak_plugins='
 PLUGIN_EXTRA_DEPS	= $(EXECUTABLE)
-PLUGIN_LDFLAGS		:= -Wl,--enable-auto-import -shared ./libscummvm.a
+PLUGIN_LDFLAGS		+= -Wl,--enable-auto-import -shared ./libscummvm.a
 PRE_OBJS_FLAGS		:= -Wl,--whole-archive
 POST_OBJS_FLAGS		:= -Wl,--export-all-symbols -Wl,--no-whole-archive -Wl,--out-implib,./libscummvm.a
 '
@@ -4278,7 +4278,7 @@ if test "$_elf_loader" = yes; then
 	_plugin_suffix=".plg"
 	_mak_plugins='
 PLUGIN_EXTRA_DEPS	= $(EXECUTABLE)
-PLUGIN_LDFLAGS		= -nostartfiles backends/plugins/elf/version.o -Wl,-q,--retain-symbols-file,$(srcdir)/backends/plugins/elf/plugin.syms -Xlinker --just-symbols -Xlinker $(EXECUTABLE)
+PLUGIN_LDFLAGS		+= -nostartfiles backends/plugins/elf/version.o -Wl,-q,--retain-symbols-file,$(srcdir)/backends/plugins/elf/plugin.syms -Xlinker --just-symbols -Xlinker $(EXECUTABLE)
 PRE_OBJS_FLAGS		:= -Wl,--whole-archive
 POST_OBJS_FLAGS		:= -Wl,--no-whole-archive
 '"$_mak_plugins"
@@ -6399,7 +6399,7 @@ OBJS += $OBJS
 DEFINES += $DEFINES
 LDFLAGS += $LDFLAGS
 
-PLUGIN_LDFLAGS += $PLUGIN_LDFLAGS
+PLUGIN_LDFLAGS = $PLUGIN_LDFLAGS
 $_mak_plugins
 
 port_mk = $_port_mk


Commit: a2f12d5788206f55fb5b67245eae9a38431a6a9d
    https://github.com/scummvm/scummvm/commit/a2f12d5788206f55fb5b67245eae9a38431a6a9d
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-06-18T18:23:58+02:00

Commit Message:
RISCOS: Add LDFLAGS to plugins too

Changed paths:
    configure


diff --git a/configure b/configure
index bb7a928cb5d..1e80a70d408 100755
--- a/configure
+++ b/configure
@@ -3196,6 +3196,7 @@ if test -n "$_host"; then
 			# -O2 causes internal compiler error on VFP only with gcc 4.7
 			_optimization_level=-O1
 			append_var LDFLAGS "-L$GCCSDK_INSTALL_ENV/vfp/lib"
+			append_var PLUGIN_LDFLAGS "-L$GCCSDK_INSTALL_ENV/vfp/lib"
 			append_var CXXFLAGS "-isystem $GCCSDK_INSTALL_ENV/vfp/include"
 			if test -z "$PKG_CONFIG_LIBDIR"; then
 				PKG_CONFIG_LIBDIR="$GCCSDK_INSTALL_ENV/vfp/lib/pkgconfig"
@@ -3207,10 +3208,12 @@ if test -n "$_host"; then
 			append_var CXXFLAGS "-mtune=cortex-a9"
 			append_var CXXFLAGS "-mfpu=vfp"
 			append_var LDFLAGS "-mfpu=vfp"
+			append_var PLUGIN_LDFLAGS "-mfpu=vfp"
 			append_var ASFLAGS "-mfpu=vfp"
 			;;
 		arm-*riscos)
 			append_var LDFLAGS "-L$GCCSDK_INSTALL_ENV/lib"
+			append_var PLUGIN_LDFLAGS "-L$GCCSDK_INSTALL_ENV/lib"
 			append_var CXXFLAGS "-isystem $GCCSDK_INSTALL_ENV/include"
 			if test -z "$PKG_CONFIG_LIBDIR"; then
 				PKG_CONFIG_LIBDIR="$GCCSDK_INSTALL_ENV/lib/pkgconfig"