76e66240da
Fix the following build failure raised since bump to version 3.4.10 in
commit 0ce776942d:
/usr/bin/ld: cannot find /usr/lib64/libatomic.so.1.0.0
collect2: error: ld returned 1 exit status
make[3]: *** [run/lemon] Error 1
Fixes:
- http://autobuild.buildroot.org/results/02ea7d76a683b039fb37e005578644108bd1e3b7
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
32 lines
1.0 KiB
Diff
32 lines
1.0 KiB
Diff
From 33270f56477542dedf978e660cf8d08464f28797 Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Fri, 26 Nov 2021 17:45:23 +0100
|
|
Subject: [PATCH] cmake: lemon: wipe CMAKE_{EXE_LINKER_FLAGS,SYSROOT} if needed
|
|
|
|
Wipe CMAKE_{EXE_LINKER_FLAGS,SYSROOT} when LEMON_C_COMPILER is set to
|
|
avoid a build failure when cross-compiling (e.g. with buildroot)
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Upstream status:
|
|
https://gitlab.com/wireshark/wireshark/-/merge_requests/5224]
|
|
---
|
|
tools/lemon/CMakeLists.txt | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/tools/lemon/CMakeLists.txt b/tools/lemon/CMakeLists.txt
|
|
index 8742aa9fc9..7a9263fe0d 100644
|
|
--- a/tools/lemon/CMakeLists.txt
|
|
+++ b/tools/lemon/CMakeLists.txt
|
|
@@ -12,6 +12,8 @@ add_executable(lemon lemon.c)
|
|
if(DEFINED LEMON_C_COMPILER)
|
|
set(CMAKE_C_COMPILER "${LEMON_C_COMPILER}")
|
|
set(CMAKE_C_FLAGS "")
|
|
+ set(CMAKE_EXE_LINKER_FLAGS "")
|
|
+ set(CMAKE_SYSROOT "")
|
|
endif()
|
|
|
|
# To keep lemon.c as close to upstream as possible, deliberately ignore
|
|
--
|
|
2.33.0
|
|
|