aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2016-04-06 21:53:19 +0200
committerJo-Philipp Wich <jo@mein.io>2016-04-06 21:53:19 +0200
commitc47abdea2537894021c7c2c73ab6c1394a2d9d6a (patch)
tree5142ff961c2e66b8d3b02d846e4d63e55ed03fb2
parent54fbe8afdd28d0619d8ccede9fcf183d745584a4 (diff)
downloadupstream-c47abdea2537894021c7c2c73ab6c1394a2d9d6a.tar.gz
upstream-c47abdea2537894021c7c2c73ab6c1394a2d9d6a.tar.bz2
upstream-c47abdea2537894021c7c2c73ab6c1394a2d9d6a.zip
include/target.mk: default to CPU_TYPE for the package architecture
Use the more specific CPU_TYPE designation as default package architecture and only fall back to ARCH if no specific CPU_TYPE is set. This means that e.g. ar71xx packages will use "74kc" as architecture, not "mips" which is a precondition for sharing packages between targets. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
-rw-r--r--include/target.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/target.mk b/include/target.mk
index 76fbd99423..a9d4c5db05 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -1,5 +1,6 @@
#
# Copyright (C) 2007-2008 OpenWrt.org
+# Copyright (C) 2016 LEDE Project
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -280,7 +281,7 @@ define BuildTargets/DumpCurrent
echo 'Target-Name: $(BOARDNAME)$(if $(SUBTARGETS),$(if $(SUBTARGET),))'; \
echo 'Target-Path: $(subst $(TOPDIR)/,,$(PWD))'; \
echo 'Target-Arch: $(ARCH)'; \
- echo 'Target-Arch-Packages: $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD))'; \
+ echo 'Target-Arch-Packages: $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(if $(CPU_TYPE),$(CPU_TYPE),$(ARCH)))'; \
echo 'Target-Features: $(FEATURES)'; \
echo 'Target-Depends: $(DEPENDS)'; \
echo 'Target-Optimization: $(if $(CFLAGS),$(CFLAGS),$(DEFAULT_CFLAGS))'; \