| Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame^] | 1 | From fe6e8eec7e7df4f1e72f0c9d9337b1fe11236687 Mon Sep 17 00:00:00 2001 |
| 2 | From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> |
| 3 | Date: Thu, 28 Apr 2022 17:36:54 +0200 |
| 4 | Subject: [PATCH] Fix overwriting linker flags |
| 5 | |
| 6 | Upstream-Status: Backport |
| 7 | [https://github.com/akheron/jansson/commit/fe6e8eec7e7df4f1e72f0c9d9337b1fe11236687] |
| 8 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> |
| 9 | |
| 10 | --- |
| 11 | CMakeLists.txt | 2 +- |
| 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 13 | |
| 14 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 15 | index 39b9ad365f78..ed33e3c47f70 100644 |
| 16 | --- a/CMakeLists.txt |
| 17 | +++ b/CMakeLists.txt |
| 18 | @@ -342,7 +342,7 @@ if(JANSSON_BUILD_SHARED_LIBS) |
| 19 | ) |
| 20 | list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES "-Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym") |
| 21 | if (VSCRIPT_WORKS) |
| 22 | - set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym") |
| 23 | + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym") |
| 24 | endif() |
| 25 | endif() |
| 26 | |
| 27 | -- |
| 28 | 2.35.1 |
| 29 | |