ref: aa86438a0d5f7e24506b3bc66603eefe3cf26096
parent: fda86393b883e55fce86c379200d79f29f5a7d97
parent: 533702b3703f54908f3484c6d7f313cfc6d5b33d
author: Johann Koenig <johannkoenig@google.com>
date: Wed Oct 23 16:22:11 EDT 2019
Merge "simplify darwin autodetection"
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -767,41 +767,9 @@
# 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