diff options
| author | midipix <writeonce@midipix.org> | 2019-01-01 01:04:21 -0500 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2019-01-01 01:07:40 -0500 |
| commit | 5e3ee1f15fb87a3e061faec5b5a25587af7b36c3 (patch) | |
| tree | d25525dcb98da8299e172683a10dd3b39e2b0a52 | |
| parent | d0476ea068b5ff53522d1f53fdce69aa7f32557d (diff) | |
| download | ntcon-5e3ee1f15fb87a3e061faec5b5a25587af7b36c3.tar.bz2 ntcon-5e3ee1f15fb87a3e061faec5b5a25587af7b36c3.tar.xz | |
build system: ccenv: refined the os detection logic.
| -rw-r--r-- | sofort/ccenv/ccenv.sh | 13 |
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 |