From 1eccc1842e2c6a0bce4c448320341f1aef1683b7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 15 Aug 2011 12:12:44 +0200 Subject: cosmetic changes for jtools build --- mk/vars.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'mk/vars.mk') diff --git a/mk/vars.mk b/mk/vars.mk index 3776b57b4..2c7e1259a 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -136,6 +136,7 @@ TARGET_CONFIGURE_OPTS= PATH='${TARGET_PATH}' \ CROSS='$(TARGET_CROSS)' HOST_CONFIGURE_OPTS= CC_FOR_BUILD='${CC_FOR_BUILD}' \ + CXX_FOR_BUILD='${CXX_FOR_BUILD}' \ CPPFLAGS_FOR_BUILD='${CPPFLAGS_FOR_BUILD}' \ CFLAGS_FOR_BUILD='${CFLAGS_FOR_BUILD}' \ LDFLAGS_FOR_BUILD='${LDFLAGS_FOR_BUILD}' -- cgit v1.2.3 From 36c4d46389c888b948448b34284af1d7dfd60508 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 15 Aug 2011 12:18:17 +0200 Subject: fix compile for arm target --- mk/vars.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'mk/vars.mk') diff --git a/mk/vars.mk b/mk/vars.mk index 3776b57b4..925635d01 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -47,6 +47,10 @@ TARGET_PATH= ${SCRIPT_DIR}:${TOOLS_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_HOST_ REAL_GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX) GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux +ifeq ($(CPU_ARCH),arm) +QEMU:= qemu-arm +endif + ifeq ($(ADK_NATIVE),y) TARGET_CROSS:= TARGET_COMPILER_PREFIX?= @@ -138,7 +142,8 @@ TARGET_CONFIGURE_OPTS= PATH='${TARGET_PATH}' \ HOST_CONFIGURE_OPTS= CC_FOR_BUILD='${CC_FOR_BUILD}' \ CPPFLAGS_FOR_BUILD='${CPPFLAGS_FOR_BUILD}' \ CFLAGS_FOR_BUILD='${CFLAGS_FOR_BUILD}' \ - LDFLAGS_FOR_BUILD='${LDFLAGS_FOR_BUILD}' + LDFLAGS_FOR_BUILD='${LDFLAGS_FOR_BUILD}' \ + QEMU='$(QEMU)' PKG_SUFFIX:= $(strip $(subst ",, $(ADK_PACKAGE_SUFFIX))) -- cgit v1.2.3 From a749a1f34e0fe6d22e9858494cffac021c0034cc Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 17 Aug 2011 05:39:08 +0200 Subject: revert CXX_FOR_BUILD stuff, breaks gcj compile --- mk/vars.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'mk/vars.mk') diff --git a/mk/vars.mk b/mk/vars.mk index 893416ab2..925635d01 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -140,7 +140,6 @@ TARGET_CONFIGURE_OPTS= PATH='${TARGET_PATH}' \ CROSS='$(TARGET_CROSS)' HOST_CONFIGURE_OPTS= CC_FOR_BUILD='${CC_FOR_BUILD}' \ - CXX_FOR_BUILD='${CXX_FOR_BUILD}' \ CPPFLAGS_FOR_BUILD='${CPPFLAGS_FOR_BUILD}' \ CFLAGS_FOR_BUILD='${CFLAGS_FOR_BUILD}' \ LDFLAGS_FOR_BUILD='${LDFLAGS_FOR_BUILD}' \ -- cgit v1.2.3 From 9637f7746433e32ce710f0094aee29eea994195f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 19 Aug 2011 18:11:35 +0200 Subject: more qemu archs for OpenJDK --- mk/vars.mk | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'mk/vars.mk') diff --git a/mk/vars.mk b/mk/vars.mk index 925635d01..d4f64d068 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -50,6 +50,15 @@ GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux ifeq ($(CPU_ARCH),arm) QEMU:= qemu-arm endif +ifeq ($(CPU_ARCH),mipsel) +QEMU:= qemu-mipsel +endif +ifeq ($(CPU_ARCH),i586) +QEMU:= qemu-i386 +endif +ifeq ($(CPU_ARCH),i686) +QEMU:= qemu-i386 +endif ifeq ($(ADK_NATIVE),y) TARGET_CROSS:= -- cgit v1.2.3