Skip to content

Fix Java path probing issue on Linux. #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 21, 2016
Merged

Fix Java path probing issue on Linux. #84

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions build-tools/scripts/jdk.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,20 +91,22 @@ endif # Darwin
ifeq ($(OS),Linux)

# This is for Ubuntu and derivatives (possibly Debian too)
_LINUX_JAVA_INCLUDE_DIRS = /usr/lib/jvm/default-java/include/
_DEFAULT_LINUX_JAVA_INCLUDE_DIRS = /usr/lib/jvm/default-java/include/
_LINUX_JAVA_FALLBACK_DIRS = /usr/lib/jvm/java*
_LINUX_JAVA_JNI_INCLUDE_DIR = include
_LINUX_JAVA_JNI_OS_INCLUDE_DIR = $(DESKTOP_JAVA_JNI_INCLUDE_DIR)/linux

_DESKTOP_JAVA_INCLUDE_DIRS = $(_DEFAULT_LINUX_JAVA_INCLUDE_DIRS)

ifeq ($(wildcard $(DESKTOP_JAVA_INCLUDE_DIRS)),)
JI_JDK_INCLUDE_PATHS = $(wildcard $(JAVA_HOME)/include) $(wildcard $(JAVA_HOME)/include/linux)
ifeq ($(wildcard $(_DESKTOP_JAVA_INCLUDE_DIRS)),)
_DESKTOP_JAVA_INCLUDE_DIRS = $(wildcard $(JAVA_HOME)/include)
endif
ifeq ($(wildcard $(JI_JDK_INCLUDE_PATHS)),)
ifeq ($(wildcard $(_DESKTOP_JAVA_INCLUDE_DIRS)),)
LATEST_JDK := $(shell ls -dtr $(_LINUX_JAVA_FALLBACK_DIRS) | sort | tail -1)
JI_JDK_INCLUDE_PATHS = $(LATEST_JDK)/$(_LINUX_JAVA_JNI_INCLUDE_DIR) $(LATEST_JDK)/$(_LINUX_JAVA_JNI_OS_INCLUDE_DIR)
_DESKTOP_JAVA_INCLUDE_DIRS = $(LATEST_JDK)/$(_LINUX_JAVA_JNI_INCLUDE_DIR)
endif

JI_JDK_INCLUDE_PATHS = $(_DESKTOP_JAVA_INCLUDE_DIRS) $(_DESKTOP_JAVA_INCLUDE_DIRS)/linux

endif # Linux

$(JI_JVM_PATH):
Copy link

@directhex directhex Sep 20, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems this isn't set on Linux, so the build will fail? Seems to live in jre/lib/amd64/server/libjvm.so for me, relative to the java home location

Copy link
Contributor Author

@atsushieno atsushieno Sep 20, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It still builds, fails to run tests that depend on "jvm.dll" (which I guess is replaced by dll configs). It could be done in different PR.

Expand Down