mirror of
https://github.com/ivabus/pantry
synced 2024-11-22 08:25:07 +03:00
fix(openjdk^11)
This commit is contained in:
parent
ed28de6dcd
commit
7901ee0e30
1 changed files with 10 additions and 7 deletions
|
@ -69,6 +69,8 @@ build:
|
|||
ARGS+=" --disable-hotspot-gtest --with-jvm-features=shenandoahgc --with-conf-name=release"
|
||||
MAKE_ARGS+=" CONF=release"
|
||||
|
||||
# This is hacky, but it's necessary to version the LLVM dependency by openjdk version.
|
||||
if test {{hw.platform}} = "linux"; then
|
||||
LLVM_VERSION_MAJOR='12'
|
||||
pkgx "+llvm.org^${LLVM_VERSION_MAJOR}"
|
||||
LLVM_BIN_PATH="$(realpath "{{deps.llvm.org.prefix}}/../v${LLVM_VERSION_MAJOR}/bin")"
|
||||
|
@ -76,6 +78,7 @@ build:
|
|||
export PATH="${LLVM_BIN_PATH}:${PATH_WITHOUT_LLVM}"
|
||||
clang --version | grep "clang version ${LLVM_VERSION_MAJOR}"
|
||||
unset LLVM_VERSION_MAJOR LLVM_BIN_PATH PATH_WITHOUT_.LLVM
|
||||
fi
|
||||
if: <12
|
||||
- bash configure $ARGS
|
||||
--with-boot-jdk="$BOOT_JDK_DIR"
|
||||
|
|
Loading…
Reference in a new issue