diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2020-06-22 10:33:44 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2020-06-22 10:33:44 +0200 |
| commit | 442e2a55af0e51b9bf57aae86fc67fa425b75d0b (patch) | |
| tree | b545c56d691fc203c296231ead19f49ed78c7808 | |
| parent | 2931b2365c2f00562d0d06ad6e83b74a6618f334 (diff) | |
Add version mapping for Apple Clang 11.0.3
| -rw-r--r-- | libbuild2/cc/guess.cxx | 36 | ||||
| -rw-r--r-- | libbuild2/cxx/init.cxx | 3 |
2 files changed, 22 insertions, 17 deletions
diff --git a/libbuild2/cc/guess.cxx b/libbuild2/cc/guess.cxx index a2a6397..99599f9 100644 --- a/libbuild2/cc/guess.cxx +++ b/libbuild2/cc/guess.cxx @@ -2239,6 +2239,10 @@ namespace build2 // // https://gist.github.com/yamaya/2924292 // + // Specifically, we now look in the libc++'s __config file for the + // _LIBCPP_VERSION and use the previous version as a conservative + // estimate. + // // Note that this is Apple Clang version and not XCode version. // // 4.2 -> 3.2svn @@ -2254,23 +2258,27 @@ namespace build2 // 9.1.0 -> 5.0 // 10.0.0 -> 6.0 // 11.0.0 -> 7.0 + // 11.0.3 -> 8.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;} + uint64_t pa (var_ver->patch); + + if (mj >= 12) {mj = 8; mi = 0;} + else if (mj == 11 && (mi > 0 || pa >= 3)) {mj = 8; mi = 0;} + else 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", diff --git a/libbuild2/cxx/init.cxx b/libbuild2/cxx/init.cxx index 65d13cf..866ec12 100644 --- a/libbuild2/cxx/init.cxx +++ b/libbuild2/cxx/init.cxx @@ -337,9 +337,6 @@ namespace build2 { // Enable starting with Clang 6.0.0. // - // Note that we are using Apple to vanilla Clang version re-map - // from above so may need to update things there as well. - // // Also see Clang modules support hack in cc::compile. // // @@ Clang 9 enables modules by default in C++2a. We should |