aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2018-01-17 11:53:10 +0100
committerFelix Fietkau <nbd@nbd.name>2018-01-17 12:16:27 +0100
commitbdc412941aea6d9b1ff3f82b9541055dab77fb93 (patch)
tree7cc8e138f1eb2400cb7b7b6a2815a8be0c36d371
parentddd7cdc54bc5663eb5e12dbda85a744c85c5ea97 (diff)
downloadupstream-bdc412941aea6d9b1ff3f82b9541055dab77fb93.tar.gz
upstream-bdc412941aea6d9b1ff3f82b9541055dab77fb93.tar.bz2
upstream-bdc412941aea6d9b1ff3f82b9541055dab77fb93.zip
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@nbd.name>
-rw-r--r--rules.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/rules.mk b/rules.mk
index 3558f2f028..9d8b9f8f90 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