From 48758993b09a96f83c2bd190a5586421c90428e7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 2 Jun 2014 11:11:56 +0200 Subject: 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 --- package/openjdk7/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/openjdk7') diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index cd0fa2646..9147f5dbb 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -44,11 +44,11 @@ TARGET_CFLAGS:= $(subst march=pentium-m,march=i686,$(TARGET_CFLAGS)) TARGET_CFLAGS:= $(subst march=atom,march=i686,$(TARGET_CFLAGS)) BOOTSTRAPJDK:= ${STAGING_HOST_DIR}/bootstrap-jdk -JDKARCH:= $(CPU_ARCH) -ifeq ($(ARCH),x86) +JDKARCH:= $(ADK_TARGET_CPU_ARCH) +ifeq ($(ADK_TARGET_ARCH),x86) JDKARCH:= i386 endif -ifeq ($(CPU_ARCH),x86_64) +ifeq ($(ADK_TARGET_CPU_ARCH),x86_64) JDKARCH:= amd64 endif -- cgit v1.2.3