[openwrt/openwrt] tools/ccache: find libzstd using rpath

LEDE Commits lede-commits at lists.infradead.org
Mon Jan 11 02:40:36 EST 2021


aparcar pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/c625c821d1a3825a9fd939cb132aee8c2e713169

commit c625c821d1a3825a9fd939cb132aee8c2e713169
Author: Thomas Nixon <tom at tomn.co.uk>
AuthorDate: Sat Jan 9 22:04:48 2021 +0000

    tools/ccache: find libzstd using rpath
    
    Previously, ccache would end up using the system libzstd, which is not
    supposed to be a build requirement.
    
    Signed-off-by: Thomas Nixon <tom at tomn.co.uk>
---
 tools/ccache/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/ccache/Makefile b/tools/ccache/Makefile
index e016e0beb3..ff0204ae19 100644
--- a/tools/ccache/Makefile
+++ b/tools/ccache/Makefile
@@ -21,7 +21,10 @@ include $(INCLUDE_DIR)/cmake.mk
 
 CMAKE_HOST_OPTIONS += \
 	-DCMAKE_C_COMPILER_LAUNCHER="" \
-	-DCMAKE_CXX_COMPILER_LAUNCHER=""
+	-DCMAKE_CXX_COMPILER_LAUNCHER="" \
+	-DCMAKE_SKIP_RPATH=FALSE \
+	-DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOST}/lib" \
+
 
 define Host/Install/ccache
 	$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/



More information about the lede-commits mailing list