|
 |
69f63c |
From 731b62d4c456a3e1a70519c24eb0df2c59d943b4 Mon Sep 17 00:00:00 2001
|
|
|
69f63c |
From: Alexander Scheel <ascheel@redhat.com>
|
|
|
69f63c |
Date: Mon, 17 Jun 2019 08:48:01 -0400
|
|
|
69f63c |
Subject: [PATCH] Support LD_FLAGS from environment
|
|
|
69f63c |
|
|
|
69f63c |
Signed-off-by: Alexander Scheel <ascheel@redhat.com>
|
|
|
69f63c |
---
|
|
|
69f63c |
cmake/JSSConfig.cmake | 8 ++++++++
|
|
|
69f63c |
1 file changed, 8 insertions(+)
|
|
|
69f63c |
|
|
|
69f63c |
diff --git a/cmake/JSSConfig.cmake b/cmake/JSSConfig.cmake
|
|
|
69f63c |
index f045850a..e63dd5fa 100644
|
|
|
69f63c |
--- a/cmake/JSSConfig.cmake
|
|
|
69f63c |
+++ b/cmake/JSSConfig.cmake
|
|
|
69f63c |
@@ -174,6 +174,11 @@ macro(jss_config_ldflags)
|
|
|
69f63c |
list(APPEND JSS_LD_FLAGS "-lpthread")
|
|
|
69f63c |
list(APPEND JSS_LD_FLAGS "-ldl")
|
|
|
69f63c |
|
|
|
69f63c |
+ separate_arguments(PASSED_LD_FLAGS UNIX_COMMAND "${CMAKE_SHARED_LINKER_FLAGS}")
|
|
|
69f63c |
+ foreach(PASSED_LD_FLAG ${PASSED_LD_FLAGS})
|
|
|
69f63c |
+ list(INSERT JSS_LD_FLAGS 0 "${PASSED_LD_FLAG}")
|
|
|
69f63c |
+ endforeach()
|
|
|
69f63c |
+
|
|
|
69f63c |
# This set of flags is specific to building the libjss library.
|
|
|
69f63c |
list(APPEND JSS_LIBRARY_FLAGS "-shared")
|
|
|
69f63c |
list(APPEND JSS_LIBRARY_FLAGS "-Wl,-z,defs")
|
|
|
69f63c |
@@ -181,6 +186,9 @@ macro(jss_config_ldflags)
|
|
|
69f63c |
list(APPEND JSS_LIBRARY_FLAGS "-Wl,${JSS_SO}")
|
|
|
69f63c |
|
|
|
69f63c |
set(JSS_VERSION_SCRIPT "-Wl,--version-script,${PROJECT_SOURCE_DIR}/lib/jss.map")
|
|
|
69f63c |
+
|
|
|
69f63c |
+ message(STATUS "JSS LD FLAGS: ${JSS_LD_FLAGS}")
|
|
|
69f63c |
+ message(STATUS "JSS LIBRARY FLAGS: ${JSS_LIBRARY_FLAGS}")
|
|
|
69f63c |
endmacro()
|
|
|
69f63c |
|
|
|
69f63c |
macro(jss_config_java)
|
|
|
69f63c |
--
|
|
|
69f63c |
2.20.1
|
|
|
69f63c |
|