shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "iOS build configuration updates."

--- a/build/make/configure.sh

+++ b/build/make/configure.sh

@@ -754,6 +754,7 @@

                     fi

                 done

             fi

+            IOS_VERSION_MIN="6.0"

             ;;

     esac

@@ -788,8 +789,8 @@

             add_ldflags "-mmacosx-version-min=10.9"

             ;;

         *-iphonesimulator-*)

-            add_cflags  "-miphoneos-version-min=6.0"

-            add_ldflags "-miphoneos-version-min=6.0"

+            add_cflags  "-miphoneos-version-min=${IOS_VERSION_MIN}"

+            add_ldflags "-miphoneos-version-min=${IOS_VERSION_MIN}"

             osx_sdk_dir="$(xcrun --sdk iphonesimulator --show-sdk-path)"

             add_cflags  "-isysroot ${osx_sdk_dir}"

             add_ldflags "-isysroot ${osx_sdk_dir}"

@@ -970,12 +971,11 @@

           ;;

         darwin*)

-

             XCRUN_FIND="xcrun --sdk iphoneos -find"

             CXX="$(${XCRUN_FIND} clang++)"

             CC="$(${XCRUN_FIND} clang)"

             AR="$(${XCRUN_FIND} ar)"

-            LD="$(${XCRUN_FIND} ld)"

+            LD="${CXX:-$(${XCRUN_FIND} ld)}"

             AS="$(${XCRUN_FIND} as)"

             STRIP="$(${XCRUN_FIND} strip)"

             NM="$(${XCRUN_FIND} nm)"

@@ -989,7 +989,13 @@

             alt_libc="$(xcrun --sdk iphoneos --show-sdk-path)"

             add_cflags -arch ${tgt_isa} -isysroot ${alt_libc}

-            add_ldflags -arch ${tgt_isa} -ios_version_min 7.0

+            add_ldflags -arch ${tgt_isa}

+

+            if [ "${LD}" = "${CXX}" ]; then

+                add_ldflags -miphoneos-version-min="${IOS_VERSION_MIN}"

+            else

+                add_ldflags -ios_version_min "${IOS_VERSION_MIN}"

+            fi

             for d in lib usr/lib usr/lib/system; do

                 try_dir="${alt_libc}/${d}"