diff options
| author | Johann <johannkoenig@google.com> | 2015-01-22 18:11:21 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-01-22 18:11:21 -0800 |
| commit | 8cfe9607d90a18a13c84bfb2f4d0d3ff2424049a (patch) | |
| tree | b5dea3d8710ff633bc5265b1399f013f39bac6f7 /build/make/configure.sh | |
| parent | 0dccb6277c9350c157e866c243e9c93956635e6e (diff) | |
| parent | 4fe4c2834ffe20c092b3314490045f7faa5e09b2 (diff) | |
| download | libvpx-8cfe9607d90a18a13c84bfb2f4d0d3ff2424049a.tar libvpx-8cfe9607d90a18a13c84bfb2f4d0d3ff2424049a.tar.gz libvpx-8cfe9607d90a18a13c84bfb2f4d0d3ff2424049a.tar.bz2 libvpx-8cfe9607d90a18a13c84bfb2f4d0d3ff2424049a.zip | |
Merge "Add libvpx build targets for OS X 10.10 Yosemite."
Diffstat (limited to 'build/make/configure.sh')
| -rw-r--r-- | build/make/configure.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/build/make/configure.sh b/build/make/configure.sh index f98018027..62835db4c 100644 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -666,6 +666,10 @@ process_common_toolchain() { tgt_isa=x86_64 tgt_os=darwin13 ;; + *darwin14*) + tgt_isa=x86_64 + tgt_os=darwin14 + ;; x86_64*mingw32*) tgt_os=win64 ;; @@ -775,6 +779,10 @@ process_common_toolchain() { add_cflags "-mmacosx-version-min=10.9" add_ldflags "-mmacosx-version-min=10.9" ;; + *-darwin14-*) + add_cflags "-mmacosx-version-min=10.10" + add_ldflags "-mmacosx-version-min=10.10" + ;; *-iphonesimulator-*) add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}" add_ldflags "-miphoneos-version-min=${IOS_VERSION_MIN}" |