Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Unified Diff: ports/toybox/nacl.patch

Issue 1417223003: Switch from using 'nacl_main' to 'main' entry point (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ports/toybox/build.sh ('k') | ports/tree/build.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ports/toybox/nacl.patch
diff --git a/ports/toybox/nacl.patch b/ports/toybox/nacl.patch
index cc9c93cbe5eaff78a8291b626e799cfc92ada528..2b764590d925b2532ae4f02a00b127c84df74c1d 100644
--- a/ports/toybox/nacl.patch
+++ b/ports/toybox/nacl.patch
@@ -614,19 +614,23 @@ diff --git a/scripts/install.c b/scripts/install.c
diff --git a/scripts/make.sh b/scripts/make.sh
--- a/scripts/make.sh
+++ b/scripts/make.sh
-@@ -162,9 +162,11 @@ echo "Library probe..."
- # that doesn't exist, so we have to detect and skip nonexistent libraries
- # for it.
-
--OPTLIBS="$(for i in util crypt m; do echo "int main(int argc, char *argv[]) {return 0;}" | ${CROSS_COMPILE}${CC} -xc - -o /dev/null -Wl,--as-needed -l$i > /dev/null 2>/dev/null && echo -l$i; done)"
-+OPTLIBS="$(for i in glibc-compat nacl_io util crypt m; do echo "int main(int argc, char *argv[]) {return 0;}" | ${CROSS_COMPILE}${CC} -xc - -o /dev/null -Wl,--as-needed -l$i > /dev/null 2>/dev/null && echo -l$i; done)"
+@@ -165,6 +165,7 @@ echo "Library probe..."
+ OPTLIBS="$(for i in util crypt m; do echo "int main(int argc, char *argv[]) {return 0;}" | ${CROSS_COMPILE}${CC} -xc - -o /dev/null -Wl,--as-needed -l$i > /dev/null 2>/dev/null && echo -l$i; done)"
echo "Compile toybox..."
-+OPTLIBS="${LDFLAGS}"
-+echo $OPTLIBS
++OPTLIBS="${LIBS}"
do_loudly()
{
+@@ -172,7 +173,7 @@ do_loudly()
+ "$@"
+ }
+
+-do_loudly ${CROSS_COMPILE}${CC} $CFLAGS -I . -o toybox_unstripped $OPTIMIZE \
++do_loudly ${CROSS_COMPILE}${CC} $CFLAGS $LDFLAGS -I . -o toybox_unstripped $OPTIMIZE \
+ main.c lib/*.c $TOYFILES -Wl,--as-needed $OPTLIBS || exit 1
+ do_loudly ${CROSS_COMPILE}${STRIP} toybox_unstripped -o toybox || exit 1
+ # gcc 4.4's strip command is buggy, and doesn't set the executable bit on
diff --git a/toys.h b/toys.h
--- a/toys.h
+++ b/toys.h
« no previous file with comments | « ports/toybox/build.sh ('k') | ports/tree/build.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698