]> git.sesse.net Git - vlc/commitdiff
extras/ios: fix compilation with latest xcode releases
authorFelix Paul Kühne <fkuehne@videolan.org>
Wed, 22 Oct 2014 17:20:14 +0000 (19:20 +0200)
committerFelix Paul Kühne <fkuehne@videolan.org>
Wed, 22 Oct 2014 17:21:03 +0000 (19:21 +0200)
extras/package/ios/build.sh

index 84a006910c4656c3ba76fa568dcf03d52acff953..e788541197f720affdae65614b8c16cc05428f57 100755 (executable)
@@ -150,12 +150,8 @@ else
 export CFLAGS="${CFLAGS} -miphoneos-version-min=${SIXTYFOURBIT_SDK_MIN}"
 fi
 else
-if [ "$ARCH" != "x86_64" ]; then
-export CFLAGS="${CFLAGS} -miphoneos-version-min=${SDK_MIN}"
-else
 export CFLAGS="${CFLAGS} -miphoneos-version-min=${SIXTYFOURBIT_SDK_MIN}"
 fi
-fi
 
 export CXXFLAGS="${CFLAGS} -stdlib=libstdc++"
 
@@ -189,16 +185,10 @@ fi
 else
     EXTRA_CFLAGS="-arch ${ARCH}"
     EXTRA_LDFLAGS="-arch ${ARCH}"
-if [ "$ARCH" != "x86_64" ]; then
-    EXTRA_CFLAGS+=" -miphoneos-version-min=${SDK_MIN}"
-    EXTRA_LDFLAGS+=" -miphoneos-version-min=${SDK_MIN}"
-    export LDFLAGS="${LDFLAGS} -miphoneos-version-min=${SDK_MIN}"
-else
     EXTRA_CFLAGS+=" -miphoneos-version-min=${SIXTYFOURBIT_SDK_MIN}"
     EXTRA_LDFLAGS+=" -miphoneos-version-min=${SIXTYFOURBIT_SDK_MIN}"
     export LDFLAGS="${LDFLAGS} -miphoneos-version-min=${SIXTYFOURBIT_SDK_MIN}"
 fi
-fi
 
 
 info "LD FLAGS SELECTED = '${LDFLAGS}'"