[Scummvm-git-logs] scummvm master -> 06a7183a6ffda8357d073584b21426c8127ad239

[rsn8887]

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:
06a7183a6f BUILD: Fix PSP compilation tests for updated buildbot toolchain


Commit: 06a7183a6ffda8357d073584b21426c8127ad239
    https://github.com/scummvm/scummvm/commit/06a7183a6ffda8357d073584b21426c8127ad239
Author: rsn8887 (rsn8887 at users.noreply.github.com)
Date: 2019-04-13T19:31:26-05:00

Commit Message:
BUILD: Fix PSP compilation tests for updated buildbot toolchain

Changed paths:
    configure


diff --git a/configure b/configure
index 6075aa2..879c5ad 100755
--- a/configure
+++ b/configure
@@ -1830,6 +1830,15 @@ psp)
 		echo "Please set PSPSDK in your environment. export PSPSDK=<path to psp sdk>"
 		exit 1
 	fi
+
+	# These have to be set early because the compiler will not link successfully
+	# during testing otherwise
+	if test -d "$PSPDEV/psp/lib"; then
+		append_var LDFLAGS "-L$PSPDEV/psp/lib"
+	fi
+	append_var LDFLAGS "-L$PSPSDK/lib"
+	append_var LDFLAGS "-specs=$_srcdir/backends/platform/psp/psp.spec"
+
 	;;
 riscos)
 	if test -z "$GCCSDK_INSTALL_ENV"; then
@@ -2860,11 +2869,6 @@ case $_host_os in
 		add_line_to_config_h "#define PREFIX \"${prefix}\""
 		;;
 	psp)
-		if test -d "$PSPDEV/psp/lib"; then
-			append_var LDFLAGS "-L$PSPDEV/psp/lib"
-		fi
-		append_var LDFLAGS "-L$PSPSDK/lib"
-		append_var LDFLAGS "-specs=$_srcdir/backends/platform/psp/psp.spec"
 		_optimization_level=-O3
 		append_var CXXFLAGS "-I$PSPSDK/include"
 		# FIXME: Why is the following in CXXFLAGS and not in DEFINES? Change or document this.