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

Unified Diff: ports/toybox/nacl.patch

Issue 1804293003: Add support for new pnacl native toolchain driver (Closed) Base URL: https://chromium.googlesource.com/webports.git@master
Patch Set: Fix according to Brad's comments Created 4 years, 8 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
Index: ports/toybox/nacl.patch
diff --git a/ports/toybox/nacl.patch b/ports/toybox/nacl.patch
index 2b764590d925b2532ae4f02a00b127c84df74c1d..ae3f68c801b916d27fdfbfe7963215e50f744a58 100644
--- a/ports/toybox/nacl.patch
+++ b/ports/toybox/nacl.patch
@@ -622,15 +622,22 @@ diff --git a/scripts/make.sh b/scripts/make.sh
do_loudly()
{
-@@ -172,7 +173,7 @@ do_loudly()
+@@ -172,9 +173,13 @@ 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
+-do_loudly ${CROSS_COMPILE}${STRIP} toybox_unstripped -o toybox || exit 1
++if [ ${NACL_ARCH} -ne le32 ]; then
++ do_loudly ${CROSS_COMPILE}${STRIP} toybox_unstripped -o toybox || exit 1
++else
++ do_loudly cp toybox_unstripped toybox || exit 1
++fi
# gcc 4.4's strip command is buggy, and doesn't set the executable bit on
+ # its output the way SUSv4 suggests it do so.
+ do_loudly chmod +x toybox || exit 1
diff --git a/toys.h b/toys.h
--- a/toys.h
+++ b/toys.h
« make_all.sh ('K') | « ports/texlive/pkg_info ('k') | ports/vim/nacl.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698