Skip to content

Commit 734284b

Browse files
committed
CMake: Update to use boot jdk tools properly
Set appropriate variables from the boot jdk. Stop using FindJava module Signed-off-by: Devin Nakamura <[email protected]>
1 parent 0103797 commit 734284b

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

CMakeLists.txt

+3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ find_program(CMAKE_Java_COMPILER NAMES javac PATHS ${BOOT_JDK}/bin NO_DEFAULT_PA
3535
find_program(CMAKE_Java_RUNTIME NAMES java PATHS ${BOOT_JDK}/bin NO_DEFAULT_PATH)
3636
find_program(CMAKE_Java_AR NAMES jar PATHS ${BOOT_JDK}/bin NO_DEFAULT_PATH)
3737

38+
# Variables used by the "UseJava" module (predates "Java" language support)
3839
set(Java_JAVA_EXECUTABLE ${CMAKE_Java_RUNTIME})
40+
set(Java_JAVAC_EXECUTABLE ${CMAKE_Java_COMPILER})
41+
set(Java_JAR_EXECUTABLE ${CMAKE_Java_AR})
3942

4043
# Note: this is a temporary transition variable.
4144
set(J9VM_IS_NON_STAGING TRUE)

sourcetools/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
# set JAVA_HOME to guide FindJava
2424
set(JAVA_HOME ${BOOT_JDK})
2525

26-
include(FindJava)
2726
include(UseJava)
2827

2928
project(j9_sourcetools VERSION 1.0)

0 commit comments

Comments
 (0)