[openwrt/openwrt] build: remove use of STAGING_DIR_HOST/usr (fixes cmake build error on macOS)

LEDE Commits lede-commits at lists.infradead.org
Wed Jan 17 03:19:15 PST 2018


nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/bdc412941aea6d9b1ff3f82b9541055dab77fb93

commit bdc412941aea6d9b1ff3f82b9541055dab77fb93
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Wed Jan 17 11:53:10 2018 +0100

    build: remove use of STAGING_DIR_HOST/usr (fixes cmake build error on macOS)
    
    This directory is never created, nor is it used anywhere. Using it in
    HOST_LDFLAGS causes a linker warning to be emitted on macOS, which
    messes with cmake configure tests.
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 rules.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules.mk b/rules.mk
index 3558f2f..9d8b9f8 100644
--- a/rules.mk
+++ b/rules.mk
@@ -244,9 +244,9 @@ export PKG_CONFIG
 
 HOSTCC:=gcc
 HOSTCXX:=g++
-HOST_CPPFLAGS:=-I$(STAGING_DIR_HOST)/include -I$(STAGING_DIR_HOST)/usr/include $(if $(IS_PACKAGE_BUILD),-I$(STAGING_DIR_HOSTPKG)/include -I$(STAGING_DIR)/host/include)
+HOST_CPPFLAGS:=-I$(STAGING_DIR_HOST)/include $(if $(IS_PACKAGE_BUILD),-I$(STAGING_DIR_HOSTPKG)/include -I$(STAGING_DIR)/host/include)
 HOST_CFLAGS:=-O2 $(HOST_CPPFLAGS)
-HOST_LDFLAGS:=-L$(STAGING_DIR_HOST)/lib -L$(STAGING_DIR_HOST)/usr/lib $(if $(IS_PACKAGE_BUILD),-L$(STAGING_DIR_HOSTPKG)/lib -L$(STAGING_DIR)/host/lib)
+HOST_LDFLAGS:=-L$(STAGING_DIR_HOST)/lib $(if $(IS_PACKAGE_BUILD),-L$(STAGING_DIR_HOSTPKG)/lib -L$(STAGING_DIR)/host/lib)
 
 ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
   TARGET_AR:=$(TARGET_CROSS)gcc-ar



More information about the lede-commits mailing list