diff options
| author | midipix <writeonce@midipix.org> | 2021-04-17 15:42:28 +0000 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2021-04-17 15:43:21 +0000 |
| commit | 44d4bfeac54439917b77f6710435318089d200f8 (patch) | |
| tree | c70a52017d95d03fe1ff7461c2a8a0553ca32a06 | |
| parent | cdd2f61ace09b0a5da157a76236bc0b24051fdcf (diff) | |
| download | pemagine-44d4bfeac54439917b77f6710435318089d200f8.tar.bz2 pemagine-44d4bfeac54439917b77f6710435318089d200f8.tar.xz | |
build system: ccenv: ccenv_set_cxx(): enhanced and corrected logic.
| -rw-r--r-- | sofort/ccenv/ccenv.sh | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/sofort/ccenv/ccenv.sh b/sofort/ccenv/ccenv.sh index 67b5720..8a7c4f2 100644 --- a/sofort/ccenv/ccenv.sh +++ b/sofort/ccenv/ccenv.sh @@ -604,16 +604,25 @@ ccenv_set_cxx() ccenv_candidates="clang++" ;; *-gcc ) - ccenv_cpp_prefix=${ccenv_cc_cmd%-gcc*}- - ccenv_candidates="${ccenv_cpp_prefix}g++" ;; + ccenv_cxx_prefix=${ccenv_cc_cmd%-gcc*}- + ccenv_candidates="${ccenv_cxx_prefix}g++" ;; *-clang ) - ccenv_cpp_prefix=${ccenv_cc_cmd%-clang*}- - ccenv_candidates="${ccenv_cpp_prefix}clang++" ;; + ccenv_cxx_prefix=${ccenv_cc_cmd%-clang*}- + ccenv_candidates="${ccenv_cxx_prefix}clang++" ;; + + /*cc | /*c99 | /*c11 ) + ccenv_cxx_prefix=${ccenv_cc_cmd%/*} + ccenv_candidates="${ccenv_cxx_prefix}/cxx" + ccenv_candidates="${ccenv_candidates} ${ccenv_cxx_prefix}/c++" ;; + + /*gcc ) + ccenv_cxx_prefix=${ccenv_cc_cmd%/*} + ccenv_candidates="${ccenv_cxx_prefix}/g++" ;; - *cc ) - ccenv_cxx_prefix=${ccenv_cc_cmd%cc*} - ccenv_candidates="${ccenv_cpp_prefix}++" ;; + /*clang ) + ccenv_cxx_prefix=${ccenv_cc_cmd%/*} + ccenv_candidates="${ccenv_cxx_prefix}/clang++" ;; * ) ccenv_cxx="$ccenv_cc -xc++" |