summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2021-04-17 15:42:28 +0000
committermidipix <writeonce@midipix.org>2021-04-17 15:43:22 +0000
commitf41feb5098e7a36429621629f56da0f64dea6b05 (patch)
tree907f49d4a7754c6acd746c9d0d02c82f140e715f
parentdf0182e91bfca7960ecf41d22905442046f38b3b (diff)
downloadtpax-f41feb5098e7a36429621629f56da0f64dea6b05.tar.bz2
tpax-f41feb5098e7a36429621629f56da0f64dea6b05.tar.xz
build system: ccenv: ccenv_set_cxx(): enhanced and corrected logic.
-rw-r--r--sofort/ccenv/ccenv.sh23
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++"