aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/cc/guess.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2019-10-31 16:55:36 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2019-10-31 16:55:36 +0200
commit61c2d4e0c6885dce9965ed0707cec1da180321c9 (patch)
tree0b8b3be6af08b20289aacbdb3aa58b8b3a38bfef /libbuild2/cc/guess.cxx
parent11efae6173b3a84b1cdc4836b5b22a1ee77eb084 (diff)
Update comment on Apple Clang to vanilla Clang version mapping
Diffstat (limited to 'libbuild2/cc/guess.cxx')
-rw-r--r--libbuild2/cc/guess.cxx29
1 files changed, 14 insertions, 15 deletions
diff --git a/libbuild2/cc/guess.cxx b/libbuild2/cc/guess.cxx
index b18c516..c37b6b6 100644
--- a/libbuild2/cc/guess.cxx
+++ b/libbuild2/cc/guess.cxx
@@ -2204,25 +2204,24 @@ namespace build2
// 9.0.0 -> 4.0
// 9.1.0 -> 5.0
// 10.0.0 -> 6.0
- // 10.0.1 -> ?
- // 11.0.0 -> 7.0 (?)
+ // 11.0.0 -> 7.0
//
uint64_t mj (var_ver->major);
uint64_t mi (var_ver->minor);
- if (mj >= 11) {mj = 7; mi = 0;}
- else if (mj == 10) {mj = 6; mi = 0;}
- else if (mj == 9 && mi >= 1) {mj = 5; mi = 0;}
- else if (mj == 9) {mj = 4; mi = 0;}
- else if (mj == 8) {mj = 3; mi = 9;}
- else if (mj == 7 && mi >= 3) {mj = 3; mi = 8;}
- else if (mj == 7) {mj = 3; mi = 7;}
- else if (mj == 6 && mi >= 1) {mj = 3; mi = 5;}
- else if (mj == 6) {mj = 3; mi = 4;}
- else if (mj == 5 && mi >= 1) {mj = 3; mi = 3;}
- else if (mj == 5) {mj = 3; mi = 2;}
- else if (mj == 4 && mi >= 2) {mj = 3; mi = 1;}
- else {mj = 3; mi = 0;}
+ if (mj >= 11) {mj = 7; mi = 0;}
+ else if (mj == 10) {mj = 6; mi = 0;}
+ else if (mj == 9 && mi >= 1) {mj = 5; mi = 0;}
+ else if (mj == 9) {mj = 4; mi = 0;}
+ else if (mj == 8) {mj = 3; mi = 9;}
+ else if (mj == 7 && mi >= 3) {mj = 3; mi = 8;}
+ else if (mj == 7) {mj = 3; mi = 7;}
+ else if (mj == 6 && mi >= 1) {mj = 3; mi = 5;}
+ else if (mj == 6) {mj = 3; mi = 4;}
+ else if (mj == 5 && mi >= 1) {mj = 3; mi = 3;}
+ else if (mj == 5) {mj = 3; mi = 2;}
+ else if (mj == 4 && mi >= 2) {mj = 3; mi = 1;}
+ else {mj = 3; mi = 0;}
ver = compiler_version {
to_string (mj) + '.' + to_string (mi) + ".0",