Skip to content

Commit ee3e18b

Browse files
committed
chore(stacks): use clang build java
1 parent bd456e8 commit ee3e18b

1 file changed

Lines changed: 15 additions & 6 deletions

File tree

stacks/java/make.sh

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
set -eux
1+
set -eux;
2+
3+
function clean_before_exit {
4+
rm -rf /workspace/jdk-jdk-*-* /workspace/java.tar.gz
5+
sleep 3
6+
}
7+
trap clean_before_exit EXIT
8+
29
tag=$(echo "${STACK_VERSION}" | awk -F "." '{print "jdk-"$1"+"$2}')
310
curl -fsSL -o java.tar.gz https://github.com/openjdk/jdk/archive/refs/tags/${tag}.tar.gz
411
tar -xvzf java.tar.gz
@@ -13,18 +20,21 @@ install-packages \
1320
libcups2-dev \
1421
libfontconfig1-dev \
1522
libasound2-dev \
16-
zip
23+
zip \
24+
clang
1725

18-
apt-get update -yq
1926
main_version=$(echo "${STACK_VERSION}" | awk -F "." '{print $1}')
2027
version_build=$(echo "${STACK_VERSION}" | awk -F "." '{print $2}')
21-
if [ -z "$(apt-cache search openjdk-${main_version}-jdk)" ]; then
28+
29+
apt-get update -yq
30+
if [[ -n "$(apt-cache search openjdk-${main_version}-jdk)" ]]; then
2231
install-packages openjdk-${main_version}-jdk
2332
else
2433
install-packages openjdk-17-jdk
2534
fi
2635

2736
bash configure \
37+
--with-toolchain-type=clang \
2838
--with-jvm-variants=server \
2939
--enable-unlimited-crypto \
3040
--with-version-build="${version_build}" \
@@ -34,5 +44,4 @@ bash configure \
3444
-with-native-debug-symbols=external \
3545
--disable-warnings-as-errors
3646
make
37-
cp -rf build/linux-*-server-release/jdk/* "${DATA_DIR}"
38-
rm -rf /workspace/jdk-jdk-*-* java.tar.gz
47+
cp -rf build/linux-*-server-release/jdk/* "${DATA_DIR}"

0 commit comments

Comments
 (0)