From: mistachkin <mistachkin@noemail.net>
Date: Fri, 27 May 2016 21:13:43 +0000 (+0000)
Subject: Check for Clang before GCC.
X-Git-Tag: version-3.14.0~124^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ce6cdd51511feeaa45b02451424f64bfabadd50;p=thirdparty%2Fsqlite.git

Check for Clang before GCC.

FossilOrigin-Name: 7c2cd4b05f88a759bdf72d3a249db5984fd7105d
---

diff --git a/manifest b/manifest
index 6b25a7bcf8..43de9fbb03 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\ssurplus\squotation\smarks\sfrom\sthe\sCOMPILER=\scompile_options\ssetting\sfor\sClang.
-D 2016-05-27T20:30:02.032
+C Check\sfor\sClang\sbefore\sGCC.
+D 2016-05-27T21:13:43.995
 F Makefile.in f59e0763ff448719fc1bd25513882b0567286317
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 306d73e854b1a92ea06e5d1e637faa5c44de53c7
@@ -329,7 +329,7 @@ F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
 F src/build.c 785fa789319d93c6ae20efbd01d4da9ce8f8a793
 F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
-F src/ctime.c 5fffce9c220c2694bdefcc5297d77f14266370b8
+F src/ctime.c 89ae9d9959010022a14bb36dea1b360da760b092
 F src/date.c 1cc9fb516ec9932c6fd4d2a0d2f8bc4480145c39
 F src/dbstat.c c845548d4346e606e2f2b7d2e714ace2b8a7dd1b
 F src/delete.c 4aba4214a377ce8ddde2d2e609777bcc8235200f
@@ -1495,7 +1495,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 664c132dabe4a871d5c39c11b339f871ca3a5d31
-R c95d80b350856738e8dbac827a63287b
+P 5c966f200018043f5258eb03e043bb25c7766131
+R f374868f610dd3d0429b813be905b071
 U mistachkin
-Z 5ee041c65db3cfb46a182fca07281d4b
+Z 313307f37a580f7772d82428c7123b20
diff --git a/manifest.uuid b/manifest.uuid
index aeff037a85..41c0c8e659 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5c966f200018043f5258eb03e043bb25c7766131
\ No newline at end of file
+7c2cd4b05f88a759bdf72d3a249db5984fd7105d
\ No newline at end of file
diff --git a/src/ctime.c b/src/ctime.c
index a39917af99..b33d803ba2 100644
--- a/src/ctime.c
+++ b/src/ctime.c
@@ -47,10 +47,10 @@ static const char * const azCompileOpt[] = {
 #endif
 #if defined(_MSC_VER)
   "COMPILER=msvc-" CTIMEOPT_VAL(_MSC_VER),
-#elif defined(__GNUC__) && defined(__VERSION__)
-  "COMPILER=gcc-" __VERSION__,
 #elif defined(__clang__) && defined(__clang_version__)
   "COMPILER=clang-" __clang_version__,
+#elif defined(__GNUC__) && defined(__VERSION__)
+  "COMPILER=gcc-" __VERSION__,
 #endif
 #if SQLITE_COVERAGE_TEST
   "COVERAGE_TEST",