[Cmake-commits] CMake branch, next, updated. v3.7.0-1158-ge10b5d7
Brad King
brad.king at kitware.com
Tue Nov 15 09:32:05 EST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via e10b5d73603644a63da6877474dc0dc939b27438 (commit)
via d608e85cfea0616ce292b8abdf4419c3fc349604 (commit)
from cbeb29833dd044b386c765abdb5aee57e6c2f7ec (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e10b5d73603644a63da6877474dc0dc939b27438
commit e10b5d73603644a63da6877474dc0dc939b27438
Merge: cbeb298 d608e85
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 15 09:32:04 2016 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 15 09:32:04 2016 -0500
Merge topic 'armcc-response-file-flag' into next
d608e85c ARMCC: Fix flag used for response files
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d608e85cfea0616ce292b8abdf4419c3fc349604
commit d608e85cfea0616ce292b8abdf4419c3fc349604
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Nov 14 09:06:12 2016 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 15 09:31:33 2016 -0500
ARMCC: Fix flag used for response files
ARMCC does not use the `@` sigil to indicate response files, but instead
the `--via=` flag. See the documentation here:
http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0491h/CHDCIEGC.html
Fixes: #16425
diff --git a/Modules/Compiler/ARMCC.cmake b/Modules/Compiler/ARMCC.cmake
index 2ec75c3..250a8f4 100644
--- a/Modules/Compiler/ARMCC.cmake
+++ b/Modules/Compiler/ARMCC.cmake
@@ -28,6 +28,7 @@ macro(__compiler_armcc lang)
set(CMAKE_${lang}_OUTPUT_EXTENSION ".o")
set(CMAKE_${lang}_OUTPUT_EXTENSION_REPLACE 1)
+ set(CMAKE_${lang}_RESPONSE_FILE_LINK_FLAG "--via=")
set(CMAKE_${lang}_LINK_EXECUTABLE "<CMAKE_LINKER> <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES> <OBJECTS> -o <TARGET> --list <TARGET_BASE>.map")
set(CMAKE_${lang}_CREATE_STATIC_LIBRARY "<CMAKE_AR> --create -cr <TARGET> <LINK_FLAGS> <OBJECTS>")
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/ARMCC.cmake | 1 +
1 file changed, 1 insertion(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list