kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Append to CMAKE_ASM_FLAGS rather than replace it.

Browse Source 
Otherwise we clobber things like -m32.

Change-Id: I9457e4b50dc3063643c31d19c7935276b8a312a1
Reviewed-on: https://boringssl-review.googlesource.com/7209
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2016-02-23 17:44:12 -05:00 committed by Adam Langley
parent 65f83b64d9
commit 3dbecdf6f4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/CMakeLists.txt
View File

@ -22,7 +22,7 @@ elseif(UNIX)
endif()
set(ASM_EXT S)
enable_language(ASM)
set(CMAKE_ASM_FLAGS "-Wa,--noexecstack")
set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -Wa,--noexecstack")
else()
if (CMAKE_CL_64)
message("Using nasm")