Andrew Geissler | 4b7c115 | 2020-11-30 19:55:29 -0600 | [diff] [blame] | 1 | From 0eee3fb85dad084b6b42f7b219d8aa3a62620a27 Mon Sep 17 00:00:00 2001 |
| 2 | From: Yi Zhao <yi.zhao@windriver.com> |
| 3 | Date: Wed, 28 Oct 2020 09:52:40 +0800 |
| 4 | Subject: [PATCH] civetweb/CMakeLists.txt: do not search gcc-ar and gcc-ranlib |
| 5 | |
| 6 | Do not search gcc-ar and gcc-ranlib. Specify GCC_AR and GCC_RANLIB in |
| 7 | EXTRA_OECMAKE to avoid host contamination. |
| 8 | |
| 9 | Upstream-Status: Inappropriate [embedded specific] |
| 10 | |
| 11 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
| 12 | --- |
| 13 | thirdparty/civetweb-1.10/CMakeLists.txt | 2 -- |
| 14 | 1 file changed, 2 deletions(-) |
| 15 | |
| 16 | diff --git a/thirdparty/civetweb-1.10/CMakeLists.txt b/thirdparty/civetweb-1.10/CMakeLists.txt |
| 17 | index f559a04e..0689e3f6 100644 |
| 18 | --- a/thirdparty/civetweb-1.10/CMakeLists.txt |
| 19 | +++ b/thirdparty/civetweb-1.10/CMakeLists.txt |
| 20 | @@ -246,11 +246,9 @@ set_property(CACHE CIVETWEB_CXX_STANDARD PROPERTY STRINGS auto c++14 c++11 c++98 |
| 21 | |
| 22 | # Configure the linker |
| 23 | if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") |
| 24 | - find_program(GCC_AR gcc-ar) |
| 25 | if (GCC_AR) |
| 26 | set(CMAKE_AR ${GCC_AR}) |
| 27 | endif() |
| 28 | - find_program(GCC_RANLIB gcc-ranlib) |
| 29 | if (GCC_RANLIB) |
| 30 | set(CMAKE_RANLIB ${GCC_RANLIB}) |
| 31 | endif() |
| 32 | -- |
| 33 | 2.17.1 |
| 34 | |