diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-02 11:11:56 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-02 17:13:35 +0200 |
| commit | 48758993b09a96f83c2bd190a5586421c90428e7 (patch) | |
| tree | 28e4554cb26cc1294d06d6241b255d9e20190deb /toolchain | |
| parent | 8a2c6310e1e2764865ef684217130ed713d654e7 (diff) | |
refactor CPU_ARCH/ARCH variables
After Joerg asked me about the difference between
ADK_TARGET_ARCH and ADK_TARGET_CPU_ARCH I recognized many duplication
of variables for this information.
These patch fixes this up. Use make cleandir && make menuconfig && make
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/gcc/Makefile | 2 | ||||
| -rw-r--r-- | toolchain/glibc/Makefile | 3 | ||||
| -rw-r--r-- | toolchain/kernel-headers/Makefile | 1 | ||||
| -rw-r--r-- | toolchain/musl/Makefile | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 36fd30deb..f82fe7002 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -89,7 +89,7 @@ else GCC_CONFOPTS+= --enable-target-optspace endif -ifeq ($(ARCH),arm) +ifeq ($(ADK_TARGET_ARCH),arm) GCC_CONFOPTS+= --with-float=$(ADK_TARGET_FLOAT) ifneq ($(ADK_TARGET_FPU),) GCC_CONFOPTS+= --with-fpu=$(ADK_TARGET_FPU) diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index b095c4ab5..f1163195c 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -10,9 +10,6 @@ ifneq ($(ADK_DEBUG),) TARGET_CFLAGS+= -O2 endif -# ssp unsupported -TARGET_CFLAGS:= $(filter-out -fstack-protector-all,$(TARGET_CFLAGS)) - include Makefile.inc include ${TOPDIR}/mk/buildhlp.mk diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index 44ae9944d..79f6351d7 100644 --- a/toolchain/kernel-headers/Makefile +++ b/toolchain/kernel-headers/Makefile @@ -3,6 +3,7 @@ include $(TOPDIR)/rules.mk include ../rules.mk +include ${TOPDIR}/mk/kernel-ver.mk include $(TOPDIR)/mk/linux.mk include ${TOPDIR}/mk/kernel-vars.mk include ${TOPDIR}/mk/buildhlp.mk diff --git a/toolchain/musl/Makefile b/toolchain/musl/Makefile index b49b793f2..720f1a41e 100644 --- a/toolchain/musl/Makefile +++ b/toolchain/musl/Makefile @@ -6,7 +6,7 @@ include ../rules.mk include Makefile.inc include ${TOPDIR}/mk/buildhlp.mk -ifeq ($(CPU_ARCH),ppc) +ifeq ($(ADK_TARGET_CPU_ARCH),ppc) GNU_TARGET_NAME:= $(subst ppc,powerpc,$(GNU_TARGET_NAME)) endif |