diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d0c3752fb1..259dd3cd00 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -589,7 +589,7 @@ Ubuntu_AndroidNDK_arm64-v8a: - ccache/ - build/extern/fetched/ before_script: - - CI/install_debian_deps.sh gcc + - CI/install_debian_deps.sh android stage: build script: - df -h diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh index 131af70264..980915ec47 100755 --- a/CI/before_script.linux.sh +++ b/CI/before_script.linux.sh @@ -28,6 +28,7 @@ declare -a CMAKE_CONF_OPTS=( -DUSE_SYSTEM_TINYXML=ON -DOPENMW_USE_SYSTEM_RECASTNAVIGATION=ON -DOPENMW_CXX_FLAGS="-Werror -Werror=implicit-fallthrough" # flags specific to OpenMW project + -DCMAKE_EXE_LINKER_FLAGS="${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=mold" ) if [[ $CI_OPENMW_USE_STATIC_DEPS ]]; then @@ -63,12 +64,6 @@ if [[ "${CMAKE_CXX_FLAGS_DEBUG}" ]]; then ) fi -if [[ "${CMAKE_EXE_LINKER_FLAGS}" ]]; then - CMAKE_CONF_OPTS+=( - -DCMAKE_EXE_LINKER_FLAGS="${CMAKE_EXE_LINKER_FLAGS}" - ) -fi - if [[ "${BUILD_WITH_CODE_COVERAGE}" ]]; then CMAKE_CONF_OPTS+=( -DBUILD_WITH_CODE_COVERAGE="${BUILD_WITH_CODE_COVERAGE}" diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh index ed89063d3d..ca68326a63 100755 --- a/CI/install_debian_deps.sh +++ b/CI/install_debian_deps.sh @@ -9,8 +9,8 @@ print_help() { } declare -rA GROUPED_DEPS=( - [gcc]="binutils gcc build-essential cmake ccache curl unzip git pkg-config" - [clang]="binutils clang make cmake ccache curl unzip git pkg-config" + [gcc]="binutils gcc build-essential cmake ccache curl unzip git pkg-config mold" + [clang]="binutils clang make cmake ccache curl unzip git pkg-config mold" # Common dependencies for building OpenMW. [openmw-deps]=" @@ -75,6 +75,8 @@ declare -rA GROUPED_DEPS=( python3-pip xvfb " + + [android]="binutils build-essential cmake ccache curl unzip git pkg-config" ) if [[ $# -eq 0 ]]; then