diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-01-22 15:29:36 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-01-22 15:29:36 +0100 |
| commit | 37d240ecf9213a29d6a0a236ebeb1e72c0b43ce6 (patch) | |
| tree | 6bd2508d867303d8830aab0f246cd61a7ec5a835 /cmake | |
| parent | e8f6f402922295ec36aab42976f3e494455407d4 (diff) | |
| parent | 5caddbfd5b4a7ec377f3d40a5830436e0e6e993b (diff) | |
| download | mariadb-git-37d240ecf9213a29d6a0a236ebeb1e72c0b43ce6.tar.gz | |
MySQL-5.5.35 merge
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/os/Linux.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
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) |