From 533702b3703f54908f3484c6d7f313cfc6d5b33d Mon Sep 17 00:00:00 2001 From: Johann Date: Wed, 23 Oct 2019 14:17:57 -0400 Subject: [PATCH] simplify darwin autodetection Use sed to extract tgt_os Change-Id: I2f7cd290102a2b591c6ae6e40766918b55abff10 --- build/make/configure.sh | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) diff --git a/build/make/configure.sh b/build/make/configure.sh index db22b04..0e25f65 100644 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -767,41 +767,9 @@ process_common_toolchain() { # detect tgt_os case "$gcctarget" in - *darwin10*) + *darwin1[0-8]*) tgt_isa=x86_64 - tgt_os=darwin10 - ;; - *darwin11*) - tgt_isa=x86_64 - tgt_os=darwin11 - ;; - *darwin12*) - tgt_isa=x86_64 - tgt_os=darwin12 - ;; - *darwin13*) - tgt_isa=x86_64 - tgt_os=darwin13 - ;; - *darwin14*) - tgt_isa=x86_64 - tgt_os=darwin14 - ;; - *darwin15*) - tgt_isa=x86_64 - tgt_os=darwin15 - ;; - *darwin16*) - tgt_isa=x86_64 - tgt_os=darwin16 - ;; - *darwin17*) - tgt_isa=x86_64 - tgt_os=darwin17 - ;; - *darwin18*) - tgt_isa=x86_64 - tgt_os=darwin18 + tgt_os=`echo $gcctarget | sed 's/.*\(darwin1[0-8]\).*/\1/'` ;; x86_64*mingw32*) tgt_os=win64 -- 2.7.4