diff options
| author | Johann <johannkoenig@google.com> | 2011-12-14 11:11:03 -0800 |
|---|---|---|
| committer | Johann <johannkoenig@google.com> | 2011-12-14 11:16:38 -0800 |
| commit | 247e7343d54a9954f1c4bbdaa8cb01793bc7ed9e (patch) | |
| tree | 8e4ea44149611f01961604553965131c5a70147a /build/make | |
| parent | c4aeff94b16a6f71d6bea91c442d8b94056d9a75 (diff) | |
| download | libvpx-247e7343d54a9954f1c4bbdaa8cb01793bc7ed9e.tar libvpx-247e7343d54a9954f1c4bbdaa8cb01793bc7ed9e.tar.gz libvpx-247e7343d54a9954f1c4bbdaa8cb01793bc7ed9e.tar.bz2 libvpx-247e7343d54a9954f1c4bbdaa8cb01793bc7ed9e.zip | |
Use xcode 4.2
Allow targeting darwin11 / 10.7
Update arm paths for iPhoneOS 5.0
Change-Id: I057156349311ec66a163c4c1cea60dc5aeaaa492
Diffstat (limited to 'build/make')
| -rwxr-xr-x | build/make/configure.sh | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/build/make/configure.sh b/build/make/configure.sh index 1279f781a..0426f9220 100755 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -561,6 +561,10 @@ process_common_toolchain() { tgt_isa=x86_64 tgt_os=darwin10 ;; + *darwin11*) + tgt_isa=x86_64 + tgt_os=darwin11 + ;; *mingw32*|*cygwin*) [ -z "$tgt_isa" ] && tgt_isa=x86 tgt_os=win32 @@ -617,6 +621,9 @@ process_common_toolchain() { if [ -d "/Developer/SDKs/MacOSX10.6.sdk" ]; then osx_sdk_dir="/Developer/SDKs/MacOSX10.6.sdk" fi + if [ -d "/Developer/SDKs/MacOSX10.7.sdk" ]; then + osx_sdk_dir="/Developer/SDKs/MacOSX10.7.sdk" + fi case ${toolchain} in *-darwin8-*) @@ -637,6 +644,12 @@ process_common_toolchain() { add_ldflags "-isysroot ${osx_sdk_dir}" add_ldflags "-mmacosx-version-min=10.6" ;; + *-darwin11-*) + add_cflags "-isysroot ${osx_sdk_dir}" + add_cflags "-mmacosx-version-min=10.7" + add_ldflags "-isysroot ${osx_sdk_dir}" + add_ldflags "-mmacosx-version-min=10.7" + ;; esac # Handle Solaris variants. Solaris 10 needs -lposix4 @@ -732,7 +745,7 @@ process_common_toolchain() { TOOLCHAIN_PATH=${SDK_PATH}/usr/bin CC=${TOOLCHAIN_PATH}/gcc AR=${TOOLCHAIN_PATH}/ar - LD=${TOOLCHAIN_PATH}/arm-apple-darwin10-gcc-4.2.1 + LD=${TOOLCHAIN_PATH}/arm-apple-darwin10-llvm-gcc-4.2 AS=${TOOLCHAIN_PATH}/as STRIP=${TOOLCHAIN_PATH}/strip NM=${TOOLCHAIN_PATH}/nm @@ -746,13 +759,13 @@ process_common_toolchain() { add_cflags -arch ${tgt_isa} add_ldflags -arch_only ${tgt_isa} - add_cflags "-isysroot ${SDK_PATH}/SDKs/iPhoneOS4.3.sdk" + add_cflags "-isysroot ${SDK_PATH}/SDKs/iPhoneOS5.0.sdk" # This should be overridable - alt_libc=${SDK_PATH}/SDKs/iPhoneOS4.3.sdk + alt_libc=${SDK_PATH}/SDKs/iPhoneOS5.0.sdk # Add the paths for the alternate libc - for d in usr/include usr/include/gcc/darwin/4.2/ usr/lib/gcc/arm-apple-darwin10/4.2.1/include/; do + for d in usr/include; do try_dir="${alt_libc}/${d}" [ -d "${try_dir}" ] && add_cflags -I"${try_dir}" done |