summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2019-01-01 01:04:21 -0500
committermidipix <writeonce@midipix.org>2019-01-01 01:07:40 -0500
commit7fd6d6ce0e8f02b02c3f7a3571d7d6090212b297 (patch)
tree961cdcd2b8787d1780279d1b530a7874b64f8618
parent474ea8f4653a548fb05b0e35bac08b2a0a8567c8 (diff)
downloadntapi-7fd6d6ce0e8f02b02c3f7a3571d7d6090212b297.tar.bz2
ntapi-7fd6d6ce0e8f02b02c3f7a3571d7d6090212b297.tar.xz
build system: ccenv: refined the os detection logic.
-rw-r--r--sofort/ccenv/ccenv.sh13
1 files changed, 9 insertions, 4 deletions
diff --git a/sofort/ccenv/ccenv.sh b/sofort/ccenv/ccenv.sh
index 31b7dd5..c786f90 100644
--- a/sofort/ccenv/ccenv.sh
+++ b/sofort/ccenv/ccenv.sh
@@ -700,14 +700,19 @@ ccenv_set_os()
case "$ccenv_cchost" in
*-*-*-* )
- ccenv_tip=${ccenv_host%-*}
+ ccenv_tip=${ccenv_cchost%-*}
ccenv_os=${ccenv_tip#*-*-}
;;
-
- *-*-* )
- ccenv_tip=${ccenv_host%-*}
+ *-*-musl | *-*-gnu )
+ ccenv_tip=${ccenv_cchost%-*}
ccenv_os=${ccenv_tip#*-}
;;
+ *-*-* )
+ ccenv_os=${ccenv_cchost#*-*-}
+ ;;
+ *-* )
+ ccenv_os=${ccenv_cchost#*-}
+ ;;
esac
if [ -z "$ccenv_os" ]; then