Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 7 additions & 7 deletions setup_oss_toolchain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ else
BITNESS_PKGS=""
fi

DEB_UBUNTU_PKGS="unzip"
DEB_UBUNTU_PKGS="unzip
default-jdk-headless"

BOOST_DEB_UBUNTU_PKGS="libboost-filesystem-dev$BITNESS_SUFFIX
libboost-iostreams-dev$BITNESS_SUFFIX
Expand Down Expand Up @@ -119,14 +120,14 @@ function install_from_apt {
function handle_debian {
case $1 in
1[3-9])
install_from_apt default-jdk-headless kotlin ${DEB_UBUNTU_PKGS} ${BOOST_DEB_UBUNTU_PKGS} ${PROTOBUF_DEB_UBUNTU_PKGS} ${GOOGLETEST_DEB_UBUNTU_PKGS}
install_from_apt kotlin ${DEB_UBUNTU_PKGS} ${BOOST_DEB_UBUNTU_PKGS} ${PROTOBUF_DEB_UBUNTU_PKGS} ${GOOGLETEST_DEB_UBUNTU_PKGS}
;;
12)
install_from_apt default-jdk-headless kotlin ${DEB_UBUNTU_PKGS} ${BOOST_DEB_UBUNTU_PKGS} ${PROTOBUF_DEB_UBUNTU_PKGS}
install_from_apt kotlin ${DEB_UBUNTU_PKGS} ${BOOST_DEB_UBUNTU_PKGS} ${PROTOBUF_DEB_UBUNTU_PKGS}
install_googletest_from_source
;;
11)
install_from_apt default-jdk-headless ${DEB_UBUNTU_PKGS} ${BOOST_DEB_UBUNTU_PKGS} ${PROTOBUF_DEB_UBUNTU_PKGS}
install_from_apt ${DEB_UBUNTU_PKGS} ${BOOST_DEB_UBUNTU_PKGS} ${PROTOBUF_DEB_UBUNTU_PKGS}
install_kotlin_from_source
install_googletest_from_source
;;
Expand All @@ -140,11 +141,10 @@ function handle_debian {
function handle_ubuntu {
case $1 in
2[4-9]*)
# We don't support JDK 21 yet. Replace this with default-jdk-headless once we support it.
install_from_apt openjdk-17-jdk-headless kotlin ${DEB_UBUNTU_PKGS} ${BOOST_DEB_UBUNTU_PKGS} ${PROTOBUF_DEB_UBUNTU_PKGS} ${GOOGLETEST_DEB_UBUNTU_PKGS}
install_from_apt kotlin ${DEB_UBUNTU_PKGS} ${BOOST_DEB_UBUNTU_PKGS} ${PROTOBUF_DEB_UBUNTU_PKGS} ${GOOGLETEST_DEB_UBUNTU_PKGS}
;;
2[2-3]*)
install_from_apt default-jdk-headless kotlin ${DEB_UBUNTU_PKGS} ${BOOST_DEB_UBUNTU_PKGS} ${PROTOBUF_DEB_UBUNTU_PKGS}
install_from_apt kotlin ${DEB_UBUNTU_PKGS} ${BOOST_DEB_UBUNTU_PKGS} ${PROTOBUF_DEB_UBUNTU_PKGS}
install_googletest_from_source
;;
*)
Expand Down
Loading