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

Unified Diff: ports/zlib/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
« make_all.sh ('K') | « ports/zlib/build.sh ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ports/zlib/nacl.patch
diff --git a/ports/zlib/nacl.patch b/ports/zlib/nacl.patch
index 720f3b8766959025c34d20ac45225c799038ade1..a7a5c3c1bcec85ef4ce9d101e0b507d735eae8b9 100644
--- a/ports/zlib/nacl.patch
+++ b/ports/zlib/nacl.patch
@@ -1,7 +1,20 @@
diff --git a/configure b/configure
--- a/configure
+++ b/configure
-@@ -188,6 +188,13 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then
+@@ -20,7 +20,11 @@ date >> configure.log
+
+ # set command prefix for cross-compilation
+ if [ -n "${CHOST}" ]; then
+- uname="`echo "${CHOST}" | sed -e 's/^[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)-.*$/\1/'`"
++ if [ "${CHOST}" = "le32-nacl" ]; then
++ uname="pnacl"
++ else
++ uname="`echo "${CHOST}" | sed -e 's/^[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)-.*$/\1/'`"
++ fi
+ CROSS_PREFIX="${CHOST}-"
+ fi
+
+@@ -188,6 +192,13 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then
*BSD | *bsd* | DragonFly)
LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"}
LDCONFIG="ldconfig -m" ;;
« make_all.sh ('K') | « ports/zlib/build.sh ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698