diff --git a/submodules/build/Makefile b/submodules/build/Makefile index 0b07c59a8..71d34eed8 100644 --- a/submodules/build/Makefile +++ b/submodules/build/Makefile @@ -136,13 +136,13 @@ broadcast_%: @echo "Broadcasting target '$*' to $(all_hosts)" @for h in $(all_hosts); do \ echo "==== starting build for host $$h ===="; \ - make -f builder-iphone-os.mk host=$$h $(LINPHONE_OPTIONS) $* ; \ + make -f builder-iphone-os.mk host=$$h $(LINPHONE_OPTIONS) $* || exit 1 ; \ done build-% clean-% veryclean-%: @for h in $(all_hosts); do \ echo "==== starting build of $@ for host $$h ===="; \ - make -f builder-iphone-os.mk host=$$h $(LINPHONE_OPTIONS) $@ ; \ + make -f builder-iphone-os.mk host=$$h $(LINPHONE_OPTIONS) $@ || exit 1 ; \ done sdk: diff --git a/submodules/build/iphone-config.site b/submodules/build/iphone-config.site index 88c3a2b97..e1184fe0a 100644 --- a/submodules/build/iphone-config.site +++ b/submodules/build/iphone-config.site @@ -4,18 +4,18 @@ SDK_VERSION_MAJOR=5 SDK_VERSION=5.0 MCPU="" CLANG_TARGET_SPECIFIER=miphoneos-version-min -if test "${host_alias}" = "i386-apple-darwin" ; then +if test "${host_alias}" = "i386-apple-darwin.ios" ; then PLATFORM=Simulator ARCH=i386 CMAKE_OPTS="-DCMAKE_SYSTEM_PROCESSOR=i386" MCPU="" CLANG_TARGET_SPECIFIER=mios-simulator-version-min -elif test "${host_alias}" = "armv7-apple-darwin" ; then +elif test "${host_alias}" = "armv7-apple-darwin.ios" ; then ARCH=armv7 PLATFORM=OS CMAKE_OPTS="-DCMAKE_SYSTEM_PROCESSOR=arm" MCPU="-mcpu=cortex-a8" -elif test "${host_alias}" = "aarch64-apple-darwin" ; then +elif test "${host_alias}" = "aarch64-apple-darwin.ios" ; then ARCH=arm64 PLATFORM=OS CMAKE_OPTS="-DCMAKE_SYSTEM_PROCESSOR=aarch64"