diff options
| author | Johann Koenig <johannkoenig@google.com> | 2019-10-23 20:22:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-10-23 20:22:11 +0000 |
| commit | aa86438a0d5f7e24506b3bc66603eefe3cf26096 (patch) | |
| tree | ba43e9f4d7161ea1fcc77a087f8acbdf9c79cdec | |
| parent | fda86393b883e55fce86c379200d79f29f5a7d97 (diff) | |
| parent | 533702b3703f54908f3484c6d7f313cfc6d5b33d (diff) | |
| download | libvpx-aa86438a0d5f7e24506b3bc66603eefe3cf26096.tar libvpx-aa86438a0d5f7e24506b3bc66603eefe3cf26096.tar.gz libvpx-aa86438a0d5f7e24506b3bc66603eefe3cf26096.tar.bz2 libvpx-aa86438a0d5f7e24506b3bc66603eefe3cf26096.zip | |
Merge "simplify darwin autodetection"
| -rw-r--r-- | build/make/configure.sh | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/build/make/configure.sh b/build/make/configure.sh index db22b04da..0e25f65da 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 |