summaryrefslogtreecommitdiffstats
path: root/core/config.mk
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2011-06-07 13:09:58 -0700
committerJean-Baptiste Queru <jbq@google.com>2011-06-07 13:10:06 -0700
commit45a3ad7d225495367a47440da118609b4940fe71 (patch)
tree348b50b97632fd4dc0f46b57903582eb16d9d8f1 /core/config.mk
parent60d6ef91b6e1f7803fdf7869afba01cdf37f1b17 (diff)
parentc1efb06045132bc620e71be120a0ca71d81b35d5 (diff)
downloadbuild-45a3ad7d225495367a47440da118609b4940fe71.zip
build-45a3ad7d225495367a47440da118609b4940fe71.tar.gz
build-45a3ad7d225495367a47440da118609b4940fe71.tar.bz2
Merge c1efb060
Change-Id: I5688046fd44bc6420b541a0eb97a46d216655a3d
Diffstat (limited to 'core/config.mk')
-rw-r--r--core/config.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/config.mk b/core/config.mk
index c6f6288..e49800d 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -277,6 +277,12 @@ $(error Error: could not find jdk tools.jar, please install JDK6, \
endif
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