From: drh <drh@noemail.net>
Date: Thu, 28 Jul 2016 17:24:16 +0000 (+0000)
Subject: Improvements to the way the COMPILER compile-time option is set when compiling
X-Git-Tag: version-3.14.0~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aa0325872fa725d1c2622d3bd4f8b87a7c137bc3;p=thirdparty%2Fsqlite.git

Improvements to the way the COMPILER compile-time option is set when compiling
with Clang.

FossilOrigin-Name: 81f9cf86c48f3cd43755ded4dc97388ec650f8af
---

diff --git a/manifest b/manifest
index d4a4aa1bdd..c71c10048d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C New\stest\scase\sto\sinsure\slegacy\sCREATE\sTABLE\ssyntax\sis\ssupported.
-D 2016-07-28T12:52:30.552
+C Improvements\sto\sthe\sway\sthe\sCOMPILER\scompile-time\soption\sis\sset\swhen\scompiling\nwith\sClang.
+D 2016-07-28T17:24:16.495
 F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@ -333,7 +333,7 @@ F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
 F src/build.c d1fdfd7ab8f5447e494ef15825973bf0719527c6
 F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
-F src/ctime.c 61949e83c4c36e37195a8398ebc752780b534d95
+F src/ctime.c e77f3dc297b4b65c96da78b4ae4272fdfae863d7
 F src/date.c 1cc9fb516ec9932c6fd4d2a0d2f8bc4480145c39
 F src/dbstat.c 4f6f7f52b49beb9636ffbd517cfe44a402ba4ad0
 F src/delete.c 4aba4214a377ce8ddde2d2e609777bcc8235200f
@@ -1508,7 +1508,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 9e2b26811452a5011d0a97a689636fa4409da856
-R d76a2fc86bbf1915af6bf1dd54a28237
+P 6feff15cae8f0427be790355841d49c479c1c586
+R 675b3da4289ec2d84ea94ee475054664
 U drh
-Z 803b725d666d5af434be7409c67eabe6
+Z 0881f39f36c917424fb94c651f3aec11
diff --git a/manifest.uuid b/manifest.uuid
index f4495ea5c1..060502d932 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6feff15cae8f0427be790355841d49c479c1c586
\ No newline at end of file
+81f9cf86c48f3cd43755ded4dc97388ec650f8af
\ No newline at end of file
diff --git a/src/ctime.c b/src/ctime.c
index 1a7c69f3bf..09587ea88e 100644
--- a/src/ctime.c
+++ b/src/ctime.c
@@ -45,8 +45,10 @@ static const char * const azCompileOpt[] = {
 #if SQLITE_CHECK_PAGES
   "CHECK_PAGES",
 #endif
-#if defined(__clang__) && defined(__clang_version__)
-  "COMPILER=clang-" __clang_version__,
+#if defined(__clang__) && defined(__clang_major__)
+  "COMPILER=clang-" CTIMEOPT_VAL(__clang_major__) "."
+                    CTIMEOPT_VAL(__clang_minor__) "."
+                    CTIMEOPT_VAL(__clang_patchlevel__),
 #elif defined(_MSC_VER)
   "COMPILER=msvc-" CTIMEOPT_VAL(_MSC_VER),
 #elif defined(__GNUC__) && defined(__VERSION__)