Commit 5a83566d authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Fix build with embed-bitcode for iOS armv7.

parent 59895c69
...@@ -107,7 +107,8 @@ if(ENABLE_ASM) ...@@ -107,7 +107,8 @@ if(ENABLE_ASM)
if(CMAKE_C_COMPILER_TARGET) if(CMAKE_C_COMPILER_TARGET)
set(CMAKE_ASM_TARGET_FLAG "--target=${CMAKE_C_COMPILER_TARGET}") set(CMAKE_ASM_TARGET_FLAG "--target=${CMAKE_C_COMPILER_TARGET}")
endif() 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) enable_language(ASM)
#No optimization available yet for arm64 #No optimization available yet for arm64
if(SYSTEM_PROCESSOR MATCHES "^arm.*") if(SYSTEM_PROCESSOR MATCHES "^arm.*")
......
...@@ -27,7 +27,7 @@ include(configs/config-ios.cmake) ...@@ -27,7 +27,7 @@ include(configs/config-ios.cmake)
set(LINPHONE_BUILDER_CPPFLAGS "${LINPHONE_BUILDER_CPPFLAGS} -mcpu=cortex-a8") set(LINPHONE_BUILDER_CPPFLAGS "${LINPHONE_BUILDER_CPPFLAGS} -mcpu=cortex-a8")
#XCode7 allows bitcode #XCode7 allows bitcode
if (NOT ${XCODE_VERSION} VERSION_LESS 7) 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() endif()
# speex # speex
......
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