diff options
| author | juj <jujjyl@gmail.com> | 2013-12-25 08:39:55 -0800 |
|---|---|---|
| committer | juj <jujjyl@gmail.com> | 2013-12-25 08:39:55 -0800 |
| commit | 0caa98e6ccae219815efafe1f7692ac0dce04971 (patch) | |
| tree | ea88cea2e586c698008c132227c7cfc14d65d7b9 | |
| parent | 8178ecd4a7301f2971254707e8f379f9ed91cc3e (diff) | |
| parent | c0fcd18329fb0cf477a6beac8629e75420d05de6 (diff) | |
Merge pull request #1943 from volo-zyko/incoming
Fixed small problems which exhibit themself when building projects with ...
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | cmake/Platform/Emscripten.cmake | 2 | ||||
| -rw-r--r-- | tools/shared.py | 2 |
3 files changed, 4 insertions, 1 deletions
@@ -113,3 +113,4 @@ a license to everyone to use it as detailed in LICENSE.) * Heidi Pan <heidi.pan@intel.com> (copyright owned by Intel) * Vasilis Kalintiris <ehostunreach@gmail.com> * Adam C. Clifton <adam@hulkamaniac.com> +* Volo Zyko <volo.zyko@gmail.com> diff --git a/cmake/Platform/Emscripten.cmake b/cmake/Platform/Emscripten.cmake index c30632ca..ef813eb8 100644 --- a/cmake/Platform/Emscripten.cmake +++ b/cmake/Platform/Emscripten.cmake @@ -109,6 +109,8 @@ 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_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(CMAKE_CXX_ARCHIVE_APPEND "${CMAKE_AR} r <TARGET> ${CMAKE_START_TEMP_FILE} <LINK_FLAGS> <OBJECTS>${CMAKE_END_TEMP_FILE}") +set(CMAKE_C_ARCHIVE_APPEND "${CMAKE_AR} r <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". diff --git a/tools/shared.py b/tools/shared.py index 5a6a5360..b425c655 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -1094,7 +1094,7 @@ class Building: # 8k is a bit of an arbitrary limit, but a reasonable one # for max command line size before we use a respose file response_file = None - if WINDOWS and len(' '.join(link_cmd)) > 8192: + if len(' '.join(link_cmd)) > 8192: logging.debug('using response file for llvm-link') [response_fd, response_file] = mkstemp(suffix='.response', dir=TEMP_DIR) |