[Scummvm-git-logs] scummvm-tools master -> d8f813043981ebd12659bb6762f58fa53b3468a5

[lephilousophe]

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

Summary:
d8f8130439 CONFIGURE: Don't use "wx-config --cxx" when cross-compiling


Commit: d8f813043981ebd12659bb6762f58fa53b3468a5
    https://github.com/scummvm/scummvm-tools/commit/d8f813043981ebd12659bb6762f58fa53b3468a5
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-04-10T11:03:42+02:00

Commit Message:
CONFIGURE: Don't use "wx-config --cxx" when cross-compiling

Changed paths:
    configure


diff --git a/configure b/configure
index 71636c8fb..d2c09cd8f 100755
--- a/configure
+++ b/configure
@@ -1843,9 +1843,11 @@ if test "$_wxwidgets" = yes ; then
 	# _wxstaticlibs may contain non-static libraries that we also have in _wxstaticlibs.
 	# remove those to avoid dependency on non-static libraries
 
-	# Use the compiler specified by wx-config. This is needed on some systems to get a working executable.
-	CXX="`$_wxconfig --cxx`"
-	LD=$CXX
+	# Use the compiler specified by wx-config when not cross-compiling. This is needed on some systems to get a working executable.
+	if test -z "$_host"; then
+		CXX="`$_wxconfig --cxx`"
+		LD=$CXX
+	fi
 
 echo_n "Checking for wxwidgets gui dev component... "
 	has_wx_gui_dev=no