From: Felix Fietkau <nbd@nbd.name>
Date: Fri, 20 Sep 2024 09:23:24 +0000 (+0200)
Subject: ucode: another fix for host installation
X-Git-Tag: v6.2~15
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e9ce65fe7960f2a5abfd0e374aa67cffb31325b6;p=librecmc%2Flibrecmc.git

ucode: another fix for host installation

The previous host installation fix accidentally moved the rpath settings
out of CMAKE_HOST_OPTIONS and into CMAKE_OPTIONS.

Fixes: ae42ecaad4e7 ("ucode: fix host installation")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit 2ee1392e094f9b6fdb2a759e2e29fa203b61e066)
---

diff --git a/package/utils/ucode/Makefile b/package/utils/ucode/Makefile
index 2bec1768b3..4de753aee3 100644
--- a/package/utils/ucode/Makefile
+++ b/package/utils/ucode/Makefile
@@ -26,7 +26,9 @@ include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/cmake.mk
 
 CMAKE_OPTIONS += \
-	-DSOVERSION=$(PKG_ABI_VERSION) \
+	-DSOVERSION=$(PKG_ABI_VERSION)
+
+CMAKE_HOST_OPTIONS += \
 	-DCMAKE_SKIP_RPATH=FALSE \
 	-DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOSTPKG}/lib"