Commit 079c2364 authored by Felix Paul Kühne's avatar Felix Paul Kühne

extras/ios: fix compilation with latest xcode releases

(cherry picked from commit 5027938fb4965bca2d3e11ad1c17ca7aecaed258)
parent ef931323
...@@ -150,12 +150,8 @@ else ...@@ -150,12 +150,8 @@ else
export CFLAGS="${CFLAGS} -miphoneos-version-min=${SIXTYFOURBIT_SDK_MIN}" export CFLAGS="${CFLAGS} -miphoneos-version-min=${SIXTYFOURBIT_SDK_MIN}"
fi fi
else else
if [ "$ARCH" != "x86_64" ]; then
export CFLAGS="${CFLAGS} -miphoneos-version-min=${SDK_MIN}"
else
export CFLAGS="${CFLAGS} -miphoneos-version-min=${SIXTYFOURBIT_SDK_MIN}" export CFLAGS="${CFLAGS} -miphoneos-version-min=${SIXTYFOURBIT_SDK_MIN}"
fi fi
fi
export CXXFLAGS="${CFLAGS} -stdlib=libstdc++" export CXXFLAGS="${CFLAGS} -stdlib=libstdc++"
...@@ -189,16 +185,10 @@ fi ...@@ -189,16 +185,10 @@ fi
else else
EXTRA_CFLAGS="-arch ${ARCH}" EXTRA_CFLAGS="-arch ${ARCH}"
EXTRA_LDFLAGS="-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_CFLAGS+=" -miphoneos-version-min=${SIXTYFOURBIT_SDK_MIN}"
EXTRA_LDFLAGS+=" -miphoneos-version-min=${SIXTYFOURBIT_SDK_MIN}" EXTRA_LDFLAGS+=" -miphoneos-version-min=${SIXTYFOURBIT_SDK_MIN}"
export LDFLAGS="${LDFLAGS} -miphoneos-version-min=${SIXTYFOURBIT_SDK_MIN}" export LDFLAGS="${LDFLAGS} -miphoneos-version-min=${SIXTYFOURBIT_SDK_MIN}"
fi fi
fi
info "LD FLAGS SELECTED = '${LDFLAGS}'" info "LD FLAGS SELECTED = '${LDFLAGS}'"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment