X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Tools%2FGCCProxy%2Fgccproxy.sh;h=59880812f7fa3a29c390efc40a7109f1a6f2de5b;hb=98bd9c0c8985c50c42231c116a4e18fedd47761e;hp=477c4766641c622318bfa97088f3fc7de2de72a6;hpb=b0da731b2d89b9dd58de2c98eaf6218a41a21920;p=tpg%2Facess2.git

diff --git a/Tools/GCCProxy/gccproxy.sh b/Tools/GCCProxy/gccproxy.sh
index 477c4766..59880812 100755
--- a/Tools/GCCProxy/gccproxy.sh
+++ b/Tools/GCCProxy/gccproxy.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+toolname=${0##*-}
+
 # Get invocation path (which could be a symlink in $PATH)
 fullpath=`which "$0"`
 if [[ !$? ]]; then
@@ -16,6 +18,10 @@ _miscargs=""
 _compile=0
 _linktype=Applications
 
+echo [GCCProxy] $toolname $* >&2
+
+
+
 while [[ $# -gt 0 ]]; do
 	case "$1" in
 	-E)
@@ -48,6 +54,9 @@ while [[ $# -gt 0 ]]; do
 		arg=${arg/,/ }
 		_ldflags=$_ldflags" ${arg}"
 		;;
+	-Wall|-Werror|-Wextra)\
+		_cflags=$_cflags" $1"
+		;;
 	-l|-L)
 		_libs=$_libs" $1$2"
 		shift
@@ -61,10 +70,29 @@ while [[ $# -gt 0 ]]; do
 	--inv=ld)
 		_actas=ld
 		;;
+	-pthread)
+		_ldflags=$_ldflags" -lpthread"
+		;;
 	-print-prog-name=ld)
 		echo $0 --inv=ld
 		exit 0
 		;;
+	-print-search-dirs)
+		_compile=1
+		_cflags=$_cflags" $1"
+		;;
+	-print-multi-os-directory)
+		_compile=1
+		_cflags=$_cflags" $1"
+		;;
+	-dumpspecs)
+		_compile=1
+		_miscargs=$_miscargs" $1"
+		;;
+	-dumpversion)
+		_compile=1
+		_miscargs=$_miscargs" $1"
+		;;
 	*)
 		_miscargs=$_miscargs" $1"
 		;;
@@ -73,11 +101,16 @@ while [[ $# -gt 0 ]]; do
 done
 
 run() {
-	#echo --- $*
+	if [[ "x$GCCPROXY_DEBUG" != "x" ]]; then
+		echo --- $*
+	fi
 	$*
 	return $?
 }
 
+_ldflags="-lposix -lpsocket "$_ldflags
+_cflags=$_cflags" -fno-omit-frame-pointer"
+
 cfgfile=`mktemp`
 make --no-print-directory -f $BASEDIR/getconfig.mk ARCH=x86 TYPE=$_linktype > $cfgfile
 . $cfgfile
@@ -85,8 +118,31 @@ rm $cfgfile
 
 #echo "_compile = $_compile, _preproc = $_preproc"
 
+if [[ "$toolname" == "g++" ]]; then
+	COMPILER=$_CXX
+	_libs="-lc++ $_libs"
+elif [[ "$toolname" == "gcc" ]]; then
+	COMPILER=$_CC
+else
+	echo "ERROR: Unknown tool name $toolname" >&2
+	exit 1
+fi
+
+if [[ "x$_verarg" != "x" ]]; then
+	if [[ "x$_actas" == "xld" ]]; then
+		run $_LD $_miscargs $_verarg
+	else
+		run $_CC $_miscargs $_verarg
+	fi
+	exit $?
+fi
+
 if [[ "x$_actas" == "xld" ]]; then
-	run $_LD $LDFLAGS $_ldflags $_outfile $_miscargs $LIBGCC_PATH $_libs
+	if echo "$_miscargs" | grep '\.o\|\.a'; then
+		run $_LD $LDFLAGS $_ldflags $_outfile $_miscargs $LIBGCC_PATH $_libs
+	else
+		run $_LD $_miscargs $_verarg
+	fi
 	exit $?
 fi
 
@@ -99,11 +155,11 @@ elif [[ $_compile -eq 1 ]]; then
 elif echo " $_miscargs" | grep '\.c' >/dev/null; then
 	tmpout=`mktemp acess_gccproxy.XXXXXXXXXX.o --tmpdir`
 	run $_CC $CFLAGS $_cflags $_miscargs -c -o $tmpout
-	run $_LD $LDFLAGS $_ldflags $_libs $tmpout $_outfile $LIBGCC_PATH $_libs
+	run $_LD $LDFLAGS $_ldflags $CRTBEGIN $_libs $tmpout $_outfile $_libs $LIBGCC_PATH $CRTEND
 	_rv=$?
 	rm $tmpout
 	exit $_rv
 else
-	run $_LD$_ldflags $_miscargs $_outfile $LDFLAGS  $_libs
+	run $_LD $_ldflags $CRTBEGIN $_miscargs $_outfile $LDFLAGS $_libs $LIBGCC_PATH $CRTEND
 fi