From 3719d10d11ccd03be7cba95a0947b2d1fdf4fab6 Mon Sep 17 00:00:00 2001 From: drh Date: Mon, 15 Feb 2016 18:58:37 +0000 Subject: [PATCH] In the tool/warning.sh script, disable Android-specific compiler warning tests when not running on Linux. FossilOrigin-Name: 153f01a821e9844d0a2e418eb83c60f6c7695c8d --- manifest | 12 ++++++------ manifest.uuid | 2 +- tool/warnings.sh | 2 ++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index fb28a48001..aea14572f9 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sharmless\scompiler\swarnings\spreviously\sseen\sin\s64-bit\sMSVC\sbuilds. -D 2016-02-15T18:47:26.307 +C In\sthe\stool/warning.sh\sscript,\sdisable\sAndroid-specific\scompiler\swarning\stests\nwhen\snot\srunning\son\sLinux. +D 2016-02-15T18:58:37.285 F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 30f075dc4f27a07abb76088946b2944178d85347 @@ -1425,9 +1425,9 @@ F tool/varint.c 5d94cb5003db9dbbcbcc5df08d66f16071aee003 F tool/vdbe-compress.tcl 5926c71f9c12d2ab73ef35c29376e756eb68361c F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 -F tool/warnings.sh ef6ebc6fd8d2dc35db3b622015c16a023d4fef4f +F tool/warnings.sh a98af506df552f3b3c0d904f94e4cdc4e1a6d598 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 9b3454762d142113f5923d754ca6bd2edefbd362 -R b07e46417f5dffc4daced5861e5000cb +P 7026246300392a83cc23817dbc54c2c66bf1f2b3 +R fc9aa743a12cf9b6bf1ff5f64fb6b62a U drh -Z df21a5d736621ec1a72e81dad263dffb +Z e0842079d26b7ffa8e27ebf0376ee458 diff --git a/manifest.uuid b/manifest.uuid index 18b1a303eb..186003bd91 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -7026246300392a83cc23817dbc54c2c66bf1f2b3 \ No newline at end of file +153f01a821e9844d0a2e418eb83c60f6c7695c8d \ No newline at end of file diff --git a/tool/warnings.sh b/tool/warnings.sh index 6c7cb3a8f8..cee639dc45 100644 --- a/tool/warnings.sh +++ b/tool/warnings.sh @@ -10,6 +10,7 @@ gcc -c -Wshadow -Wall -Wextra -pedantic-errors -Wno-long-long -std=c89 \ -ansi -DHAVE_STDINT_H -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_RTREE \ -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_JSON1 \ sqlite3.c +if test x`uname` = 'xLinux'; then echo '********** Android configuration ******************************' gcc -c \ -DHAVE_USLEEP=1 \ @@ -32,6 +33,7 @@ gcc -c \ -DUSE_PREAD64 \ -Wshadow -Wall -Wextra \ -Os sqlite3.c shell.c +fi echo '********** No optimizations. ENABLE_STAT4. THREADSAFE=0 *******' gcc -c -Wshadow -Wall -Wextra -pedantic-errors -Wno-long-long -std=c89 \ -ansi -DSQLITE_ENABLE_STAT4 -DSQLITE_THREADSAFE=0 \