diff options
-rwxr-xr-x | payloads/libpayload/bin/lpas | 27 | ||||
-rwxr-xr-x | payloads/libpayload/bin/lpgcc | 17 |
2 files changed, 35 insertions, 9 deletions
diff --git a/payloads/libpayload/bin/lpas b/payloads/libpayload/bin/lpas index 37125b472d..a82570ceb0 100755 --- a/payloads/libpayload/bin/lpas +++ b/payloads/libpayload/bin/lpas @@ -27,17 +27,34 @@ ## SUCH DAMAGE. # AS wrapper for libpayload +if [ -z "${V}" ] && [ "${V}" = 1 ]; then + DEBUGME=1 +else + DEBUGME=0 +fi -DEFAULT_PREFIX=/opt +if [ $DEBUGME -eq 1 ]; then + echo "AS = $AS" +fi + +if [ -n "$AS" ]; then +b=`basename "$AS"` +if [ "$b" = "lpas" ]; then +AS="" +fi +fi + +if [ "$AS" != "" ]; then +DEFAULT_AS=$AS +else DEFAULT_AS=as +fi BASE=`dirname $0` # This will set the _LIBDIR and _INCDIR variables used below . $BASE/lp.functions -DEBUGME=0 - # This variable will contain the command line that the user wants to # pass to gas @@ -69,4 +86,8 @@ done _ASFLAGS="--32 -I$_INCDIR" +if [ $DEBUGME -eq 1 ]; then +echo "$DEFAULT_AS $_ASFLAGS $CMDLINE" +fi + $DEFAULT_AS $_ASFLAGS $CMDLINE diff --git a/payloads/libpayload/bin/lpgcc b/payloads/libpayload/bin/lpgcc index b102c853f9..241f15707a 100755 --- a/payloads/libpayload/bin/lpgcc +++ b/payloads/libpayload/bin/lpgcc @@ -27,20 +27,26 @@ ## SUCH DAMAGE. # GCC wrapper for libpayload +if [ -z "${V}" ] && [ "${V}" = 1 ]; then + DEBUGME=1 +else + DEBUGME=0 +fi + +if [ $DEBUGME -eq 1 ]; then + echo "CC = $CC" +fi + # let's not recurse. # This is a hack, I know, but it makes sure that really simple user errors # don't fork-bomb your machine. -# echo "CC = $CC" - if [ -n "$CC" ]; then -b=`basename $CC` +b=`basename "$CC"` if [ "$b" = "lpgcc" ]; then CC="" fi fi - - if [ "$CC" != "" ]; then DEFAULT_CC=$CC else @@ -62,7 +68,6 @@ trygccoption() { return $? } -DEBUGME=0 DOLINK=1 # This variable will contain the command line that the user wants to |