status-im
/
realm-js
mirror of https://github.com/status-im/realm-js.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Avoid dumping all environment variables when building core without ASan enabled.

This commit is contained in:
Mark Rowe 2016-06-01 12:20:17 -07:00
parent bef0a6ea6e
commit 332813f7f3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMake/RealmCore.cmake
View File

@ -5,7 +5,9 @@ if(${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
endif() endif()
if(SANITIZE_ADDRESS) if(SANITIZE_ADDRESS)
set(MAKEFLAGS "MAKEFLAGS=EXTRA_CFLAGS=-fsanitize=address EXTRA_LDFLAGS=-fsanitize=address") set(EXPORT_MAKEFLAGS export MAKEFLAGS='EXTRA_CFLAGS=-fsanitize=address EXTRA_LDFLAGS=-fsanitize=address')
else()
set(EXPORT_MAKEFLAGS true)
endif() endif()
if (${CMAKE_VERSION} VERSION_GREATER "3.4.0") if (${CMAKE_VERSION} VERSION_GREATER "3.4.0")
@ -97,7 +99,7 @@ function(clone_and_build_realm_core branch)
PREFIX ${core_prefix_directory} PREFIX ${core_prefix_directory}
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_COMMAND export ${MAKEFLAGS} && make -C src/realm librealm.a librealm-dbg.a BUILD_COMMAND ${EXPORT_MAKEFLAGS} && make -C src/realm librealm.a librealm-dbg.a
INSTALL_COMMAND "" INSTALL_COMMAND ""
${USES_TERMINAL_BUILD} ${USES_TERMINAL_BUILD}
) )
@ -115,7 +117,7 @@ function(build_existing_realm_core core_directory)
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_ALWAYS 1 BUILD_ALWAYS 1
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_COMMAND export ${MAKEFLAGS} && make -C src/realm librealm.a librealm-dbg.a BUILD_COMMAND ${EXPORT_MAKEFLAGS} && make -C src/realm librealm.a librealm-dbg.a
INSTALL_COMMAND "" INSTALL_COMMAND ""
${USES_TERMINAL_BUILD} ${USES_TERMINAL_BUILD}
) )