Update the tool/warnings.sh script to automatically use the right options on OpenBSD..

FossilOrigin-Name: 7940bff32aa6ea868a53680822d148b7ec7a075c01ae9e0d5ad9859bcc339054

diff --git a/manifest b/manifest
index 954fc9afccecdeaad54cf140b3ef9706c79dfcf2..e49d285261f90b51c723f86290c8d00fe7801ab9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sbuild\sso\sthat\sit\sworks\sagain\swith\sSQLITE_OMIT_SUBQUERY.
-D 2017-05-15T15:12:24.562
+C Update\sthe\stool/warnings.sh\sscript\sto\sautomatically\suse\sthe\sright\soptions\son\sOpenBSD..
+D 2017-05-16T09:49:42.023
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 8eeb80162074004e906b53d7340a12a14c471a83743aab975947e95ce061efcc
@@ -1557,7 +1557,7 @@ 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 d9ded5274b3cb947e98e70d587f71d6263f803b5
+F tool/warnings.sh 8a4acea31e0f9c562949a2d767329533c0930d699ea19c6704c0ca0aa9154068
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F vsixtest/App.xaml b76d3b48860e7454775c47ea38ffea9c4abe3e85
 F vsixtest/App.xaml.cpp c465147f50871165c60ca16955219f6c5812d6d8
@@ -1580,7 +1580,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 0f05d7e93a73bbeac0a09bbd614287507355a7d75fc7b98729bcf7607fc8e125
-R a9e25308f45891c9b24063503aeca595
-U drh
-Z 8c1e0c69d71e5343091b9dc46bca8976
+P bb0d9281588b8cc24bf2f1f10d0c56277004226adaa2ce5037782503b283b45d
+R 0af7da97ec99dfdc47acd61562c849dd
+U dan
+Z 1c514bbb65da185a2b54f96dcba53c59

diff --git a/manifest.uuid b/manifest.uuid
index de1332e1c2d20db578118c003f4b665b76d179a1..23df76dc03dccec38bf9acb870b04db97c813c3b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bb0d9281588b8cc24bf2f1f10d0c56277004226adaa2ce5037782503b283b45d
\ No newline at end of file
+7940bff32aa6ea868a53680822d148b7ec7a075c01ae9e0d5ad9859bcc339054
\ No newline at end of file

diff --git a/tool/warnings.sh b/tool/warnings.sh
index ae40cfb1aee371aea82b06b9251bb059768a0602..e9ffad44e07d571f90c7253cb0e346d913ecacaa 100644 (file)
--- a/tool/warnings.sh
+++ b/tool/warnings.sh
@@ -4,13 +4,15 @@
 # compiler warnings in SQLite.
 #
 
-# Use these for testing on Linux and Mac OSX:
-WARNING_OPTS="-Wshadow -Wall -Wextra -pedantic-errors -Wno-long-long"
-WARNING_ANDROID_OPTS="-Wshadow -Wall -Wextra"
-
-# Use these for testing on OpenBSD:
-# WARNING_OPTS=-Wall
-# WARNING_ANDROID_OPTS=-Wall
+if uname | grep -i openbsd ; then
+  # Use these for testing on OpenBSD:
+  WARNING_OPTS=-Wall
+  WARNING_ANDROID_OPTS=-Wall
+else
+  # Use these for testing on Linux and Mac OSX:
+  WARNING_OPTS="-Wshadow -Wall -Wextra -pedantic-errors -Wno-long-long"
+  WARNING_ANDROID_OPTS="-Wshadow -Wall -Wextra"
+fi
 
 rm -f sqlite3.c
 make sqlite3.c