diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-10-08 11:47:14 -0400 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-10-08 11:47:14 -0400 |
| commit | 0a229cf5a240a1ebf4ff5d0ebb501a286bc96202 (patch) | |
| tree | 2797d054788e88863d77f9826dde94fb4c276c69 /cmake/Platform/Emscripten.cmake | |
| parent | 05b6aa32a5f1633797f7eae390b3a8048b29ca69 (diff) | |
| parent | ae5ef852920ce67449af7693f05a767a87aed976 (diff) | |
Merge branch 'incoming'
Diffstat (limited to 'cmake/Platform/Emscripten.cmake')
| -rw-r--r-- | cmake/Platform/Emscripten.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/Platform/Emscripten.cmake b/cmake/Platform/Emscripten.cmake index 73f2c8ad..7c8e83fa 100644 --- a/cmake/Platform/Emscripten.cmake +++ b/cmake/Platform/Emscripten.cmake @@ -104,8 +104,8 @@ set(CMAKE_C_RESPONSE_FILE_LINK_FLAG "@") set(CMAKE_CXX_RESPONSE_FILE_LINK_FLAG "@") # Specify the program to use when building static libraries. Force Emscripten-related command line options to clang. -set(CMAKE_CXX_ARCHIVE_CREATE "${CMAKE_CXX_COMPILER} ${CMAKE_START_TEMP_FILE} -o <TARGET> -emit-llvm <LINK_FLAGS> <OBJECTS>${CMAKE_END_TEMP_FILE}") -set(CMAKE_C_ARCHIVE_CREATE "${CMAKE_C_COMPILER} ${CMAKE_START_TEMP_FILE} -o <TARGET> -emit-llvm <LINK_FLAGS> <OBJECTS>${CMAKE_END_TEMP_FILE}") +set(CMAKE_CXX_ARCHIVE_CREATE "${CMAKE_AR} rc <TARGET> ${CMAKE_START_TEMP_FILE} <LINK_FLAGS> <OBJECTS>${CMAKE_END_TEMP_FILE}") +set(CMAKE_C_ARCHIVE_CREATE "${CMAKE_AR} rc <TARGET> ${CMAKE_START_TEMP_FILE} <LINK_FLAGS> <OBJECTS>${CMAKE_END_TEMP_FILE}") # Set a global EMSCRIPTEN variable that can be used in client CMakeLists.txt to detect when building using Emscripten. # There seems to be some kind of bug with CMake, so you might need to define this manually on the command line with "-DEMSCRIPTEN=1". |