StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix tools path on Mac OS for java 7."

Browse Source
This commit is contained in:
Narayan Kamath
2013-12-06 17:11:08 +00:00
committed by Gerrit Code Review
parent fe57f66507 ab2e2e792e
commit 948206c026
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/config.mk
View File

@@ -389,16 +389,20 @@ endif
OLD_FLEX := prebuilts/misc/$(HOST_PREBUILT_TAG)/flex/flex-2.5.4a$(HOST_EXECUTABLE_SUFFIX) OLD_FLEX := prebuilts/misc/$(HOST_PREBUILT_TAG)/flex/flex-2.5.4a$(HOST_EXECUTABLE_SUFFIX)
ifeq ($(HOST_OS),darwin) ifeq ($(HOST_OS),darwin)
# Mac OS' screwy version of java uses a non-standard directory layout ifneq ($(EXPERIMENTAL_USE_JAVA7),)
# and doesn't even seem to have tools.jar. On the other hand, javac seems HOST_JDK_TOOLS_JAR:= $(shell $(BUILD_SYSTEM)/find-jdk-tools-jar.sh)
# to be able to magically find the classes in there, wherever they are, so else
# leave this blank # Deliberately set to blank for Java 6 installations on MacOS. These
# versions allegedly use a non-standard directory structure.
HOST_JDK_TOOLS_JAR := HOST_JDK_TOOLS_JAR :=
endif
else else
HOST_JDK_TOOLS_JAR:= $(shell $(BUILD_SYSTEM)/find-jdk-tools-jar.sh) HOST_JDK_TOOLS_JAR:= $(shell $(BUILD_SYSTEM)/find-jdk-tools-jar.sh)
endif
ifneq ($(HOST_JDK_TOOLS_JAR),)
ifeq ($(wildcard $(HOST_JDK_TOOLS_JAR)),) ifeq ($(wildcard $(HOST_JDK_TOOLS_JAR)),)
$(error Error: could not find jdk tools.jar, please install JDK6, \ $(error Error: could not find jdk tools.jar, please install JDK6)
which you can download from java.sun.com)
endif endif
endif endif