[openwrt/openwrt] build: do not override DESTDIR for cmake ninja host builds

LEDE Commits lede-commits at lists.infradead.org
Sat Jun 12 05:34:15 PDT 2021


nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/18430a34e6a287aaf6f13a110a3202dcac3b3d1a

commit 18430a34e6a287aaf6f13a110a3202dcac3b3d1a
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Sat Jun 12 14:32:41 2021 +0200

    build: do not override DESTDIR for cmake ninja host builds
    
    The full prefix is already passed to cmake
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 include/cmake.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/cmake.mk b/include/cmake.mk
index 7ccd872365..b38d440039 100644
--- a/include/cmake.mk
+++ b/include/cmake.mk
@@ -60,11 +60,11 @@ ifeq ($(HOST_USE_NINJA),1)
   endef
 
   define Host/Install/Default
-	+DESTDIR="$(HOST_INSTALL_DIR)" $(NINJA) -C $(HOST_BUILD_DIR) install
+	+$(NINJA) -C $(HOST_BUILD_DIR) install
   endef
 
   define Host/Uninstall/Default
-	+DESTDIR="$(HOST_INSTALL_DIR)" $(NINJA) -C $(HOST_BUILD_DIR) uninstall
+	+$(NINJA) -C $(HOST_BUILD_DIR) uninstall
   endef
 endif
 



More information about the lede-commits mailing list