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

Side by Side Diff: ports/sdl2-tests/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
OLDNEW
1 diff --git a/test/autogen.sh b/test/autogen.sh 1 diff --git a/test/autogen.sh b/test/autogen.sh
2 --- a/test/autogen.sh 2 --- a/test/autogen.sh
3 +++ b/test/autogen.sh 3 +++ b/test/autogen.sh
4 @@ -3,7 +3,7 @@ 4 @@ -3,7 +3,7 @@
5 # Regenerate configuration files 5 # Regenerate configuration files
6 cp acinclude.m4 aclocal.m4 6 cp acinclude.m4 aclocal.m4
7 found=false 7 found=false
8 -for autoconf in autoconf autoconf259 autoconf-2.59 8 -for autoconf in autoconf autoconf259 autoconf-2.59
9 +for autoconf in autoconf2.64 autoconf autoconf259 autoconf-2.59 9 +for autoconf in autoconf2.64 autoconf autoconf259 autoconf-2.59
10 do if which $autoconf >/dev/null 2>&1; then $autoconf && found=true; break; fi 10 do if which $autoconf >/dev/null 2>&1; then $autoconf && found=true; break; fi
11 done 11 done
12 if test x$found = xfalse; then 12 if test x$found = xfalse; then
13 diff --git a/test/configure b/test/configure
14 --- a/test/configure
15 +++ b/test/configure
16 @@ -2980,6 +2980,22 @@ fi
17 MATHLIB=""
18 SYS_GL_LIBS="-lGLES_CM"
19 ;;
20 + *-*-nacl*)
21 + case "$CC" in
22 + */pnacl-*)
23 + EXE=".pexe"
24 + ;;
25 + */le32-nacl-*)
26 + EXE=".pexe"
27 + ;;
28 + *)
29 + EXE=".nexe"
30 + ;;
31 + esac
32 + CFLAGS="$CFLAGS -std=gnu99"
33 + MATHLIB="-lm"
34 + SYS_GL_LIBS=""
35 + ;;
36 *)
37 ISUNIX="true"
38 EXE=""
39 @@ -2988,6 +3004,8 @@ fi
40 ;;
41 esac
42
43 +echo "----------------> Using EXE=$EXE"
44 +
45
46
47
13 diff --git a/test/configure.in b/test/configure.in 48 diff --git a/test/configure.in b/test/configure.in
14 --- a/test/configure.in 49 --- a/test/configure.in
15 +++ b/test/configure.in 50 +++ b/test/configure.in
16 @@ -67,7 +67,7 @@ case "$host" in 51 @@ -67,7 +67,10 @@ case "$host" in
17 ;; 52 ;;
18 *-*-nacl*) 53 *-*-nacl*)
19 case "$CC" in 54 case "$CC" in
20 - *pnacl*) 55 - *pnacl*)
21 + */pnacl-*) 56 + */pnacl-*)
57 + EXE=".pexe"
58 + ;;
59 + */le32-nacl-*)
22 EXE=".pexe" 60 EXE=".pexe"
23 ;; 61 ;;
24 *) 62 *)
25 @@ -86,6 +86,8 @@ case "$host" in 63 @@ -86,6 +89,8 @@ case "$host" in
26 SYS_GL_LIBS="-lGL" 64 SYS_GL_LIBS="-lGL"
27 ;; 65 ;;
28 esac 66 esac
29 + 67 +
30 +echo "----------------> Using EXE=$EXE" 68 +echo "----------------> Using EXE=$EXE"
31 AC_SUBST(EXE) 69 AC_SUBST(EXE)
32 AC_SUBST(MATHLIB) 70 AC_SUBST(MATHLIB)
33 AC_SUBST(ISMACOSX) 71 AC_SUBST(ISMACOSX)
OLDNEW
« make_all.sh ('K') | « ports/sdl2-tests/build.sh ('k') | ports/sdlquake/Makefile » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698