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

Unified 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, 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/sdl2-tests/nacl.patch
diff --git a/ports/sdl2-tests/nacl.patch b/ports/sdl2-tests/nacl.patch
index 415dcff53eaba22dada6dc9fd9905e085869d0be..63ad2417ff8592def99cdf442ce5181182287293 100644
--- a/ports/sdl2-tests/nacl.patch
+++ b/ports/sdl2-tests/nacl.patch
@@ -10,19 +10,57 @@ diff --git a/test/autogen.sh b/test/autogen.sh
do if which $autoconf >/dev/null 2>&1; then $autoconf && found=true; break; fi
done
if test x$found = xfalse; then
+diff --git a/test/configure b/test/configure
+--- a/test/configure
++++ b/test/configure
+@@ -2980,6 +2980,22 @@ fi
+ MATHLIB=""
+ SYS_GL_LIBS="-lGLES_CM"
+ ;;
++ *-*-nacl*)
++ case "$CC" in
++ */pnacl-*)
++ EXE=".pexe"
++ ;;
++ */le32-nacl-*)
++ EXE=".pexe"
++ ;;
++ *)
++ EXE=".nexe"
++ ;;
++ esac
++ CFLAGS="$CFLAGS -std=gnu99"
++ MATHLIB="-lm"
++ SYS_GL_LIBS=""
++ ;;
+ *)
+ ISUNIX="true"
+ EXE=""
+@@ -2988,6 +3004,8 @@ fi
+ ;;
+ esac
+
++echo "----------------> Using EXE=$EXE"
++
+
+
+
diff --git a/test/configure.in b/test/configure.in
--- a/test/configure.in
+++ b/test/configure.in
-@@ -67,7 +67,7 @@ case "$host" in
+@@ -67,7 +67,10 @@ case "$host" in
;;
*-*-nacl*)
case "$CC" in
- *pnacl*)
+ */pnacl-*)
++ EXE=".pexe"
++ ;;
++ */le32-nacl-*)
EXE=".pexe"
;;
*)
-@@ -86,6 +86,8 @@ case "$host" in
+@@ -86,6 +89,8 @@ case "$host" in
SYS_GL_LIBS="-lGL"
;;
esac
« 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