diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2015-05-05 20:13:39 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2015-05-05 20:13:39 +0000 |
| commit | 91960900f86ebfe2bf5f48af5363cdef02b5d005 (patch) | |
| tree | 3cfc89893147d8488b47a424a10c598def1f824f /compiler-rt/cmake/Modules/AddCompilerRT.cmake | |
| parent | 85a0e23bc874da820800b0762a344b62e38df96d (diff) | |
| download | bcm5719-llvm-91960900f86ebfe2bf5f48af5363cdef02b5d005.tar.gz bcm5719-llvm-91960900f86ebfe2bf5f48af5363cdef02b5d005.zip | |
Build ASan runtime library with -z global on Android.
llvm-svn: 236537
Diffstat (limited to 'compiler-rt/cmake/Modules/AddCompilerRT.cmake')
| -rw-r--r-- | compiler-rt/cmake/Modules/AddCompilerRT.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/compiler-rt/cmake/Modules/AddCompilerRT.cmake index a7782a19484..a4b4df356de 100644 --- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake +++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake @@ -47,13 +47,13 @@ endmacro() # OUTPUT_NAME <output library name>) macro(add_compiler_rt_runtime name arch type) if(CAN_TARGET_${arch}) - parse_arguments(LIB "SOURCES;CFLAGS;DEFS;OUTPUT_NAME" "" ${ARGN}) + parse_arguments(LIB "SOURCES;CFLAGS;LINKFLAGS;DEFS;OUTPUT_NAME" "" ${ARGN}) add_library(${name} ${type} ${LIB_SOURCES}) # Setup compile flags and definitions. set_target_compile_flags(${name} ${TARGET_${arch}_CFLAGS} ${LIB_CFLAGS}) set_target_link_flags(${name} - ${TARGET_${arch}_CFLAGS} ${LIB_CFLAGS}) + ${TARGET_${arch}_CFLAGS} ${LIB_CFLAGS} ${LIB_LINKFLAGS}) set_property(TARGET ${name} APPEND PROPERTY COMPILE_DEFINITIONS ${LIB_DEFS}) # Setup correct output directory in the build tree. |
