diff --git a/submodules/belle-sip b/submodules/belle-sip index e881f0512..0177ef2de 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit e881f0512913a75d58ffe4ae6edf9139703383cc +Subproject commit 0177ef2de50f9609d8ed0525e8878f957da6ab61 diff --git a/submodules/build/iphone-config.site b/submodules/build/iphone-config.site index ee81ad99b..995023e4a 100644 --- a/submodules/build/iphone-config.site +++ b/submodules/build/iphone-config.site @@ -44,6 +44,10 @@ echo "Selecting SDK path = ${SYSROOT_PATH}" COMMON_FLAGS=" -arch ${ARCH} ${MCPU} -isysroot ${SYSROOT_PATH} -${CLANG_TARGET_SPECIFIER}=${SDK_VERSION} -DTARGET_OS_IPHONE=1 -D__IOS -fms-extensions" +#workaround for polarssl conflicting symbols + +COMMON_FLAGS="$COMMON_FLAGS -Dsha256=polarssl_sha256" + # silence clang unused operators. This is temporary, we should find a way to compile 3rd party with correct flags :( COMMON_FLAGS="-Qunused-arguments -Wno-unknown-warning-option -Wno-unused-command-line-argument-hard-error-in-future $COMMON_FLAGS" diff --git a/submodules/linphone b/submodules/linphone index fd8136016..e5d8ff817 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit fd813601605e2f4e2cbd70e2cdb96806e3e78e41 +Subproject commit e5d8ff817a5de726d75a6a69791d6a9603fe6460