OLD | NEW |
1 diff --git a/.config b/.config | 1 diff --git a/.config b/.config |
2 --- a/.config | 2 --- a/.config |
3 +++ b/.config | 3 +++ b/.config |
4 @@ -1,81 +1,81 @@ | 4 @@ -1,81 +1,81 @@ |
5 # | 5 # |
6 # Automatically generated make config: don't edit | 6 # Automatically generated make config: don't edit |
7 # ToyBox version: KCONFIG_VERSION | 7 # ToyBox version: KCONFIG_VERSION |
8 -# Mon Nov 18 07:48:07 2013 | 8 -# Mon Nov 18 07:48:07 2013 |
9 +# Fri Jan 3 14:13:06 2014 | 9 +# Fri Jan 3 14:13:06 2014 |
10 # | 10 # |
(...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
615 --- a/scripts/make.sh | 615 --- a/scripts/make.sh |
616 +++ b/scripts/make.sh | 616 +++ b/scripts/make.sh |
617 @@ -165,6 +165,7 @@ echo "Library probe..." | 617 @@ -165,6 +165,7 @@ echo "Library probe..." |
618 OPTLIBS="$(for i in util crypt m; do echo "int main(int argc, char *argv[]) {re
turn 0;}" | ${CROSS_COMPILE}${CC} -xc - -o /dev/null -Wl,--as-needed -l$i > /dev
/null 2>/dev/null && echo -l$i; done)" | 618 OPTLIBS="$(for i in util crypt m; do echo "int main(int argc, char *argv[]) {re
turn 0;}" | ${CROSS_COMPILE}${CC} -xc - -o /dev/null -Wl,--as-needed -l$i > /dev
/null 2>/dev/null && echo -l$i; done)" |
619 | 619 |
620 echo "Compile toybox..." | 620 echo "Compile toybox..." |
621 +OPTLIBS="${LIBS}" | 621 +OPTLIBS="${LIBS}" |
622 | 622 |
623 do_loudly() | 623 do_loudly() |
624 { | 624 { |
625 @@ -172,7 +173,7 @@ do_loudly() | 625 @@ -172,9 +173,13 @@ do_loudly() |
626 "$@" | 626 "$@" |
627 } | 627 } |
628 | 628 |
629 -do_loudly ${CROSS_COMPILE}${CC} $CFLAGS -I . -o toybox_unstripped $OPTIMIZE \ | 629 -do_loudly ${CROSS_COMPILE}${CC} $CFLAGS -I . -o toybox_unstripped $OPTIMIZE \ |
630 +do_loudly ${CROSS_COMPILE}${CC} $CFLAGS $LDFLAGS -I . -o toybox_unstripped $OPT
IMIZE \ | 630 +do_loudly ${CROSS_COMPILE}${CC} $CFLAGS $LDFLAGS -I . -o toybox_unstripped $OPT
IMIZE \ |
631 main.c lib/*.c $TOYFILES -Wl,--as-needed $OPTLIBS || exit 1 | 631 main.c lib/*.c $TOYFILES -Wl,--as-needed $OPTLIBS || exit 1 |
632 do_loudly ${CROSS_COMPILE}${STRIP} toybox_unstripped -o toybox || exit 1 | 632 -do_loudly ${CROSS_COMPILE}${STRIP} toybox_unstripped -o toybox || exit 1 |
| 633 +if [ ${NACL_ARCH} -ne le32 ]; then |
| 634 + do_loudly ${CROSS_COMPILE}${STRIP} toybox_unstripped -o toybox || exit 1 |
| 635 +else |
| 636 + do_loudly cp toybox_unstripped toybox || exit 1 |
| 637 +fi |
633 # gcc 4.4's strip command is buggy, and doesn't set the executable bit on | 638 # gcc 4.4's strip command is buggy, and doesn't set the executable bit on |
| 639 # its output the way SUSv4 suggests it do so. |
| 640 do_loudly chmod +x toybox || exit 1 |
634 diff --git a/toys.h b/toys.h | 641 diff --git a/toys.h b/toys.h |
635 --- a/toys.h | 642 --- a/toys.h |
636 +++ b/toys.h | 643 +++ b/toys.h |
637 @@ -5,6 +5,8 @@ | 644 @@ -5,6 +5,8 @@ |
638 | 645 |
639 #include "generated/config.h" | 646 #include "generated/config.h" |
640 | 647 |
641 +#ifndef _SKIP_LIBC_HEADERS | 648 +#ifndef _SKIP_LIBC_HEADERS |
642 + | 649 + |
643 #include "lib/portability.h" | 650 #include "lib/portability.h" |
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
836 + return gr_name; | 843 + return gr_name; |
837 +#else | 844 +#else |
838 struct group *gr = getgrgid(gid); | 845 struct group *gr = getgrgid(gid); |
839 | 846 |
840 sprintf(TT.gid_buf, "%u", (unsigned)gid); | 847 sprintf(TT.gid_buf, "%u", (unsigned)gid); |
841 return gr ? gr->gr_name : TT.gid_buf; | 848 return gr ? gr->gr_name : TT.gid_buf; |
842 +#endif | 849 +#endif |
843 } | 850 } |
844 | 851 |
845 // Figure out size of printable entry fields for display indent/wrap | 852 // Figure out size of printable entry fields for display indent/wrap |
OLD | NEW |