diff options
| author | Tor Egge <Tor.Egge@online.no> | 2022-09-06 13:05:45 +0200 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@online.no> | 2022-09-06 13:05:45 +0200 |
| commit | cba31914951aaf7fb8728f1bdf5e89014c07c816 (patch) | |
| tree | e87ccd9d345c70ad5b90bf0ddf67f4fbdf9d0b21 /default_build_settings.cmake | |
| parent | f4f98a4943260db57e7c7d875fc91f3b2102043c (diff) | |
Update build settings for Amazon Linux 2022.
Diffstat (limited to 'default_build_settings.cmake')
| -rw-r--r-- | default_build_settings.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 50d262143b6..df55ce727f9 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -90,7 +90,7 @@ endfunction() function(setup_vespa_default_build_settings_amzn_2022) message("-- Setting up default build settings for amzn 2022") set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/openblas" PARENT_SCOPE) - set(DEFAULT_VESPA_LLVM_VERSION "13" PARENT_SCOPE) + set(DEFAULT_VESPA_LLVM_VERSION "14" PARENT_SCOPE) endfunction() function(setup_vespa_default_build_settings_ubuntu) @@ -386,7 +386,9 @@ function(vespa_use_default_java_home) execute_process(COMMAND "/usr/libexec/java_home" OUTPUT_VARIABLE DEFAULT_JAVA_HOME) string(STRIP "${DEFAULT_JAVA_HOME}" DEFAULT_JAVA_HOME) elseif(VESPA_OS_DISTRO STREQUAL "ubuntu" OR VESPA_OS_DISTRO STREQUAL "debian") - set(DEFAULT_JAVA_HOME "/usr/lib/jvm/java-17-openjdk-amd64" PARENT_SCOPE) + set(DEFAULT_JAVA_HOME "/usr/lib/jvm/java-17-openjdk-amd64") + elseif(VESPA_OS_DISTRO STREQUAL "amzn") + set(DEFAULT_JAVA_HOME "/usr/lib/jvm/java-17-amazon-corretto") endif() if(COMMAND vespa_use_specific_java_home) vespa_use_specific_java_home() |