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

Side by Side 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, 7 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 unified diff | Download patch
« make_all.sh ('K') | « ports/zlib/build.sh ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 diff --git a/configure b/configure 1 diff --git a/configure b/configure
2 --- a/configure 2 --- a/configure
3 +++ b/configure 3 +++ b/configure
4 @@ -188,6 +188,13 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2 >&1; then 4 @@ -20,7 +20,11 @@ date >> configure.log
5
6 # set command prefix for cross-compilation
7 if [ -n "${CHOST}" ]; then
8 - uname="`echo "${CHOST}" | sed -e 's/^[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^- ]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)-.*$/\1/'`"
9 + if [ "${CHOST}" = "le32-nacl" ]; then
10 + uname="pnacl"
11 + else
12 + uname="`echo "${CHOST}" | sed -e 's/^[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[ ^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)-.*$/\1/'`"
13 + fi
14 CROSS_PREFIX="${CHOST}-"
15 fi
16
17 @@ -188,6 +192,13 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2 >&1; then
5 *BSD | *bsd* | DragonFly) 18 *BSD | *bsd* | DragonFly)
6 LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script ,zlib.map"} 19 LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script ,zlib.map"}
7 LDCONFIG="ldconfig -m" ;; 20 LDCONFIG="ldconfig -m" ;;
8 + pnacl) 21 + pnacl)
9 + EXE='.pexe' ;; 22 + EXE='.pexe' ;;
10 + nacl) 23 + nacl)
11 + LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script ,zlib.map"} 24 + LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script ,zlib.map"}
12 + EXE='.nexe' ;; 25 + EXE='.nexe' ;;
13 + emscripten) 26 + emscripten)
14 + EXE='.js' ;; 27 + EXE='.js' ;;
15 CYGWIN* | Cygwin* | cygwin* | OS/2*) 28 CYGWIN* | Cygwin* | cygwin* | OS/2*)
16 EXE='.exe' ;; 29 EXE='.exe' ;;
17 MINGW* | mingw*) 30 MINGW* | mingw*)
OLDNEW
« 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