Fix build with embed-bitcode for iOS armv7.

builders/opus/CMakeLists.txt

@@ -107,7 +107,8 @@ if(ENABLE_ASM)
 	if(CMAKE_C_COMPILER_TARGET)
 		set(CMAKE_ASM_TARGET_FLAG "--target=${CMAKE_C_COMPILER_TARGET}")
 	endif()
-	set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> ${CMAKE_ASM_TARGET_FLAG} ${CMAKE_CPP_FLAGS} ${CMAKE_C_FLAGS} ${DIRECTORY_PROPERTY_COMPILE_OPTIONS} ${ARCH_OPTIONS} -o <OBJECT> -c <SOURCE>")
+	string(TOUPPER "${CMAKE_BUILD_TYPE}" UPPER_BUILD_TYPE)
+	set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> ${CMAKE_ASM_TARGET_FLAG} ${CMAKE_CPP_FLAGS} ${CMAKE_C_FLAGS} ${DIRECTORY_PROPERTY_COMPILE_OPTIONS} ${ARCH_OPTIONS} ${CMAKE_CPP_FLAGS_${UPPER_BUILD_TYPE}} ${CMAKE_C_FLAGS_${UPPER_BUILD_TYPE}} -o <OBJECT> -c <SOURCE>")
 	enable_language(ASM)
 	#No optimization available yet for arm64
 	if(SYSTEM_PROCESSOR MATCHES "^arm.*")

configs/config-ios-armv7.cmake

@@ -27,7 +27,7 @@ include(configs/config-ios.cmake)
 set(LINPHONE_BUILDER_CPPFLAGS "${LINPHONE_BUILDER_CPPFLAGS} -mcpu=cortex-a8")
 #XCode7  allows bitcode
 if (NOT ${XCODE_VERSION} VERSION_LESS 7)
-	#set(LINPHONE_BUILDER_CPPFLAGS "${LINPHONE_BUILDER_CPPFLAGS} -fembed-bitcode")
+	set(LINPHONE_BUILDER_CPPFLAGS "${LINPHONE_BUILDER_CPPFLAGS} -fembed-bitcode")
 endif()
 
 # speex