always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make java path detection robust to multiple installed jdks on linux

Browse Source
This commit is contained in:
lperron@google.com
2012-08-14 23:54:26 +00:00
parent 518e676b2c
commit 05ef0c52b7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
makefiles/Makefile.port
View File

@@ -47,7 +47,7 @@ ifeq ("$(SYSTEM)","unix")
/usr/lib/jvm/java-7-openjdk-i386
endif
SELECTED_JDK_DEF = LINUX_JDK_ROOT = $(wildcard $(CANDIDATE_JDK_ROOTS))
SELECTED_JDK_DEF = LINUX_JDK_ROOT = $(firstword $(wildcard $(CANDIDATE_JDK_ROOTS)))
endif
ifeq ($(OS),Darwin) # Assume Mac Os X
PLATFORM = MACOSX