summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Coe <bluemrp9@gmail.com>2019-09-16 10:40:06 -0700
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2019-09-20 06:39:39 +0300
commitf541d3f18eec035242303928aa65558a391d165d (patch)
tree95205276b4639db6b63803ea9f8860ffb73c5a09
parentdf61c5849987267f5daac671e0af8550ae613621 (diff)
downloadmariadb-git-f541d3f18eec035242303928aa65558a391d165d.tar.gz
MDEV-20596 Configure fails with newer CMake
Fix build error with newer cmake Fixes the following build error: CMake Error at cmake/os/Linux.cmake:29 (STRING): STRING sub-command REPLACE requires at least four arguments. Call Stack (most recent call first): CMakeLists.txt:101 (INCLUDE) CMake Error at cmake/os/Linux.cmake:29 (STRING): STRING sub-command REPLACE requires at least four arguments. Call Stack (most recent call first): CMakeLists.txt:101 (INCLUDE) The error happens when CMAKE_SHARED_LINKER_{LANG}_FLAGS is not set. Force the variable to be set to "" as input to prevent this. Signed-off-by: Ryan Coe <bluemrp9@gmail.com> Signed-off-by: Vicențiu Ciorbaru <vicentiu@mariadb.org>
-rw-r--r--cmake/os/Linux.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/os/Linux.cmake b/cmake/os/Linux.cmake
index e37fb284d70..461394c35ce 100644
--- a/cmake/os/Linux.cmake
+++ b/cmake/os/Linux.cmake
@@ -26,9 +26,9 @@ SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_GNU_SOURCE=1)
# Fix CMake (< 2.8) flags. -rdynamic exports too many symbols.
FOREACH(LANG C CXX)
- STRING(REPLACE "-rdynamic" ""
+ STRING(REPLACE "-rdynamic" ""
CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS
- ${CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS}
+ "${CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS}"
)
ENDFOREACH()