[Scummvm-git-logs] scummvm master -> f1111300c62bd215584e9077627f923673ed9493

[lephilousophe]

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

Summary:
f1111300c6 3DS: Fix library link order


Commit: f1111300c62bd215584e9077627f923673ed9493
    https://github.com/scummvm/scummvm/commit/f1111300c62bd215584e9077627f923673ed9493
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2025-10-12T18:54:52+02:00

Commit Message:
3DS: Fix library link order

Keep ctru in LDFLAGS for checks but strip it at the end of configure

Changed paths:
    configure


diff --git a/configure b/configure
index ee66ec7a4de..09209a0b239 100755
--- a/configure
+++ b/configure
@@ -2908,8 +2908,10 @@ case $_host_os in
 		append_var LDFLAGS "-march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft"
 		append_var LDFLAGS "-L$DEVKITPRO/libctru/lib"
 		append_var LDFLAGS "-L$DEVKITPRO/portlibs/3ds/lib"
+		# Add ctru in LDFLAGS for configure checks as it's needed by crt0
+		# We remove it at the end of configure
 		append_var LDFLAGS "-specs=3dsx.specs -lctru"
-		append_var LIBS "-lcitro3d"
+		append_var LIBS "-lcitro3d -lctru"
 		;;
 	amigaos*)
 		_port_mk="backends/platform/sdl/amigaos/amigaos.mk"
@@ -7511,6 +7513,9 @@ case $_host_os in
 		else
 			append_var LDFLAGS "-Wl,--no-gc-sections"
 		fi
+
+		# Remove ctru from LDFLAGS: it was added for configure checks
+		LDFLAGS=$(echo "$LDFLAGS" | sed -e 's/ -lctru//')
 		;;
 	amigaos*)
 		# In release mode use LTO to improve performance