git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tools/GCCProxy - Fixing issues discovered in compilation of SpiderWeb
[tpg/acess2.git]
/
Tools
/
GCCProxy
/
gccproxy.sh
diff --git
a/Tools/GCCProxy/gccproxy.sh
b/Tools/GCCProxy/gccproxy.sh
index
8fb035b
..
515f5d7
100755
(executable)
--- a/
Tools/GCCProxy/gccproxy.sh
+++ b/
Tools/GCCProxy/gccproxy.sh
@@
-12,21
+12,18
@@
fullpath=`readlink -f "$fullpath"`
# Get base directory
BASEDIR=`dirname "$fullpath"`
# Get base directory
BASEDIR=`dirname "$fullpath"`
-cfgfile=`mktemp`
-make --no-print-directory -f $BASEDIR/getconfig.mk ARCH=x86 > $cfgfile
-#echo $cfgfile
-#cat $cfgfile
-. $cfgfile
-rm $cfgfile
-
_miscargs=""
_compile=0
_miscargs=""
_compile=0
+_linktype=Applications
while [[ $# -gt 0 ]]; do
case "$1" in
-E)
_preproc=1
;;
while [[ $# -gt 0 ]]; do
case "$1" in
-E)
_preproc=1
;;
+ -M)
+ _makedep=1
+ ;;
-c)
_compile=1
;;
-c)
_compile=1
;;
@@
-34,9
+31,13
@@
while [[ $# -gt 0 ]]; do
shift
_outfile="-o $1"
;;
shift
_outfile="-o $1"
;;
- -I)
+ -shared)
+ _ldflags=$_ldflags" -shared -lc -lgcc"
+ _linktype=Libraries
+ ;;
+ -I|-D|-O)
+ _cflags=$_cflags" $1 $2"
shift
shift
- _cflags=$_cflags" -I$1"
;;
-I*|-D*|-O*)
_cflags=$_cflags" $1"
;;
-I*|-D*|-O*)
_cflags=$_cflags" $1"
@@
-47,9
+48,9
@@
while [[ $# -gt 0 ]]; do
arg=${arg/,/ }
_ldflags=$_ldflags" ${arg}"
;;
arg=${arg/,/ }
_ldflags=$_ldflags" ${arg}"
;;
- -l)
+ -l|-L)
+ _libs=$_libs" $1$2"
shift
shift
- _libs=$_libs" -l$1"
;;
-l*|-L*)
_libs=$_libs" $1"
;;
-l*|-L*)
_libs=$_libs" $1"
@@
-62,25
+63,30
@@
while [[ $# -gt 0 ]]; do
done
run() {
done
run() {
-
# echo
$*
+
echo ---
$*
$*
$*
+ return $?
}
}
+cfgfile=`mktemp`
+make --no-print-directory -f $BASEDIR/getconfig.mk ARCH=x86 TYPE=$_linktype > $cfgfile
+. $cfgfile
+rm $cfgfile
+
+#echo "_compile = $_compile, _preproc = $_preproc"
+
if [[ $_preproc -eq 1 ]]; then
run $_CC -E $CFLAGS $_cflags $_miscargs $_outfile
if [[ $_preproc -eq 1 ]]; then
run $_CC -E $CFLAGS $_cflags $_miscargs $_outfile
- exit $?
-fi
-if [[ $_compile -eq 1 ]]; then
+elif [[ $_makedep -eq 1 ]]; then
+ run $_CC -M $CFLAGS $_cflags $_miscargs $_outfile
+
el
if [[ $_compile -eq 1 ]]; then
run $_CC $CFLAGS $_cflags $_miscargs -c $_outfile
run $_CC $CFLAGS $_cflags $_miscargs -c $_outfile
- exit $?
-fi
-
-if echo " $_miscargs" | grep '\.c' >/dev/null; then
+elif echo " $_miscargs" | grep '\.c' >/dev/null; then
tmpout=`mktemp acess_gccproxy.XXXXXXXXXX.o --tmpdir`
tmpout=`mktemp acess_gccproxy.XXXXXXXXXX.o --tmpdir`
- run $_CC $CFLAGS $_miscargs -c -o $tmpout
- run $_LD $LDFLAGS $_ldflags $_libs $tmpout $_outfile
+ run $_CC $CFLAGS $_
cflags $_
miscargs -c -o $tmpout
+ run $_LD $LDFLAGS $_ldflags $_libs $tmpout $_outfile
-lgcc $_libs
rm $tmpout
else
rm $tmpout
else
- run $_LD
$LDFLAGS $_ldflags $_miscargs $_outfile $LIBGCC_PATH
+ run $_LD
$_ldflags $_miscargs $_outfile $LDFLAGS $_libs
fi
fi
UCC
git Repository :: git.ucc.asn.au