Skip to content

Commit

Permalink
Fixes #67 and #69.
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander Widerberg committed Dec 7, 2019
1 parent dbf75ee commit 6c5cb7a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion ios.toolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ if(MODERN_CMAKE)
message(STATUS "Will combine built (static) artifacts into FAT lib...")
endif()
else()
# Legacy code path prior to CMake 3.14
# Legacy code path prior to CMake 3.14 or fallback if no SDK_NAME specified
set(CMAKE_SYSTEM_NAME iOS CACHE INTERNAL "" ${FORCE_CACHE})
endif()
# Standard settings.
Expand Down Expand Up @@ -589,6 +589,7 @@ else()
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -DNDEBUG -O3 -ffast-math ${CMAKE_CXX_FLAGS_RELEASE}")
set(CMAKE_C_LINK_FLAGS "${SDK_NAME_VERSION_FLAGS} -Wl,-search_paths_first ${CMAKE_C_LINK_FLAGS}")
set(CMAKE_CXX_LINK_FLAGS "${SDK_NAME_VERSION_FLAGS} -Wl,-search_paths_first ${CMAKE_CXX_LINK_FLAGS}")
SET(CMAKE_ASM_FLAGS "${CFLAGS} -x assembler-with-cpp")

# In order to ensure that the updated compiler flags are used in try_compile()
# tests, we have to forcibly set them in the CMake cache, not merely set them
Expand Down

0 comments on commit 6c5cb7a

Please sign in to comment.