diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2019-10-11 09:24:33 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2019-10-11 09:24:33 +0200 |
| commit | 2388953dffb456b6905d789fa85186810bccaae3 (patch) | |
| tree | f79e898defdca21706685d85f80e3083f003c29e /libbuild2/cxx/init.cxx | |
| parent | 2fb22e7b4aedcb62bb3a4d868c311237f3537a2f (diff) | |
Switch clang-apple to primary/variant version setup
Diffstat (limited to 'libbuild2/cxx/init.cxx')
| -rw-r--r-- | libbuild2/cxx/init.cxx | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/libbuild2/cxx/init.cxx b/libbuild2/cxx/init.cxx index 52f3f5a..9bf54eb 100644 --- a/libbuild2/cxx/init.cxx +++ b/libbuild2/cxx/init.cxx @@ -202,36 +202,6 @@ namespace build2 } case compiler_type::clang: { - // Remap Apple versions to vanilla Clang based on the - // following release point. Note that Apple no longer - // discloses the mapping so it's a guesswork and we try to be - // conservative. For details see: - // - // https://gist.github.com/yamaya/2924292 - // - // 5.1 -> 3.4 - // 6.0 -> 3.5 - // 7.0 -> 3.7 - // 7.3 -> 3.8 - // 8.0 -> 3.9 - // 9.0 -> 4.0 (later ones could be 5.0) - // 9.1 -> ? - // 10.0 -> ? - // - // Note that this mapping is also used to enable experimental - // features below. - // - if (ci.id.variant == "apple") - { - 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) {mj = 3; mi = 5;} - else if (mj == 5 && mi >= 1) {mj = 3; mi = 4;} - else {mj = 3; mi = 0;} - } - if (mj >= 5) o = "-std=c++2a"; else if (mj > 3 || (mj == 3 && mi >= 5)) o = "-std=c++1z"; else if (mj == 3 && mi >= 4) o = "-std=c++1y"; |