diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-01 00:54:03 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-01 00:54:03 +0100 |
| commit | 59d9d08e2b6f6f35e781d24c47d33d26fb4ba2a5 (patch) | |
| tree | 3e4a302ccf3912d4d8a40aa271414003bfe7c9b6 /cmake | |
| parent | ce02738d7f2f2688eeec7004dd6a30293d36044f (diff) | |
| parent | 6b6d40fa6ca1fe36f2a51c2723c58dfb3fc025bb (diff) | |
| download | mariadb-git-59d9d08e2b6f6f35e781d24c47d33d26fb4ba2a5.tar.gz | |
5.5 merge
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/install_macros.cmake | 4 | ||||
| -rw-r--r-- | cmake/os/Linux.cmake | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake index f2e474395dc..b1af0bbdf39 100644 --- a/cmake/install_macros.cmake +++ b/cmake/install_macros.cmake @@ -25,10 +25,10 @@ FUNCTION (INSTALL_DEBUG_SYMBOLS) ) IF(NOT ARG_COMPONENT) - MESSAGE(FATAL_ERROR "No COMPONENT passed to INSTALL_DEBUG_SYMBOLS") + SET(ARG_COMPONENT DebugBinaries) ENDIF() IF(NOT ARG_INSTALL_LOCATION) - MESSAGE(FATAL_ERROR "No INSTALL_LOCATION passed to INSTALL_DEBUG_SYMBOLS") + SET(ARG_INSTALL_LOCATION lib) ENDIF() SET(targets ${ARG_DEFAULT_ARGS}) FOREACH(target ${targets}) diff --git a/cmake/os/Linux.cmake b/cmake/os/Linux.cmake index 36d7ade66a7..b0680d92a1b 100644 --- a/cmake/os/Linux.cmake +++ b/cmake/os/Linux.cmake @@ -1,5 +1,5 @@ -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -34,7 +34,10 @@ ENDFOREACH() # Ensure we have clean build for shared libraries # without unresolved symbols -SET(LINK_FLAG_NO_UNDEFINED "-Wl,--no-undefined") +# Not supported with AddressSanitizer +IF(NOT WITH_ASAN) + SET(LINK_FLAG_NO_UNDEFINED "-Wl,--no-undefined") +ENDIF() # 64 bit file offset support flag SET(_FILE_OFFSET_BITS 64) |