Merge commit '6481cc3d7534a34435e88d343eb5f499001032a0'

2011-02-01 10:29:35 -06:00
parent 03440c4b47 6481cc3d75
commit fdbc76bce6
136 changed files with 8269 additions and 421 deletions
--- a/cmake/launcher-templates/genericlauncher.sh.in
+++ b/cmake/launcher-templates/genericlauncher.sh.in
@@ -6,9 +6,13 @@ if test "x$1" = "x--debugger"; then
 	shift
 	cmd="$1"
 	shift
-	echo "r $@" > $bindir/gdbscript
-	echo "bt" >> $bindir/gdbscript
-	gdb $cmd -command=$bindir/gdbscript -batch --return-child-result
+	if test "x@LAUNCHERS_GOT_GDB@" = "xYES"; then
+		echo "r $@" > $bindir/gdbscript
+		echo "bt" >> $bindir/gdbscript
+		@GDB_COMMAND@ -batch -command=$bindir/gdbscript @LAUNCHERS_GDB_ARG@ $cmd
+	else
+		$cmd $@
+	fi
 else
 	$@
 fi