am 15ced7e1: Merge prelink map tweaks
* commit '15ced7e137017befbae5bdde3b7ff60a27d897d4':
Tweak prelink map
diff --git a/core/config.mk b/core/config.mk
index 7f484aa..d953b1a 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -270,6 +270,12 @@
HOST_JDK_TOOLS_JAR:= $(shell $(BUILD_SYSTEM)/find-jdk-tools-jar.sh)
endif
+# Is the host JDK 64-bit version?
+HOST_JDK_IS_64BIT_VERSION :=
+ifneq ($(filter 64-Bit, $(shell java -version 2>&1)),)
+HOST_JDK_IS_64BIT_VERSION := true
+endif
+
# It's called md5 on Mac OS and md5sum on Linux
ifeq ($(HOST_OS),darwin)
MD5SUM:=md5 -q
diff --git a/core/main.mk b/core/main.mk
index 2ab9d72..ab49415 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -70,17 +70,6 @@
$(info Checking build tools versions...)
-ifeq ($(BUILD_OS),linux)
-build_arch := $(shell uname -m)
-ifneq (64,$(findstring 64,$(build_arch)))
-$(warning ************************************************************)
-$(warning You are attempting to build on a 32-bit system.)
-$(warning Only 64-bit build environments are supported beyond froyo/2.2.)
-$(warning ************************************************************)
-$(error stop)
-endif
-endif
-
ifneq ($(HOST_OS),windows)
ifneq ($(HOST_OS)-$(HOST_ARCH),darwin-ppc)
# check for a case sensitive file system