Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

attempt fixing build on macos x86

Browse Source
This commit is contained in:
crabman 2024-05-30 09:09:45 +00:00
parent c065b689ac
commit 94d67d2b44
No known key found for this signature in database
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitlab/CI/build.gitlab-ci.yml
View File

@ -141,7 +141,7 @@ coverage:
script: script:
- export MACOSX_DEPLOYMENT_TARGET="10.13" - export MACOSX_DEPLOYMENT_TARGET="10.13"
- export VELOREN_USERDATA_STRATEGY=executable - export VELOREN_USERDATA_STRATEGY=executable
- cargo build --release --no-default-features --features default-publish --target $RUST_TARGET - cargo build --profile ${PROFILE} --no-default-features --features default-publish --target $RUST_TARGET
- cp -r target/$RUST_TARGET/release/veloren-server-cli $CI_PROJECT_DIR - cp -r target/$RUST_TARGET/release/veloren-server-cli $CI_PROJECT_DIR
- cp -r target/$RUST_TARGET/release/veloren-voxygen $CI_PROJECT_DIR - cp -r target/$RUST_TARGET/release/veloren-voxygen $CI_PROJECT_DIR
artifacts: artifacts:
@ -156,15 +156,16 @@ coverage:
extends: extends:
- .tmacos - .tmacos
before_script: before_script:
# Using fat LTO on macos_x86_64 caused timeouts in the build pipeline, overriding it to thin here fixes this
- export PROFILE="release-thinlto"
- *tmacos-before-script - *tmacos-before-script
- export RUST_TARGET="x86_64-apple-darwin" - export RUST_TARGET="x86_64-apple-darwin"
# Using fat LTO on macos_x86_64 caused timeouts in the build pipeline, overriding it to thin here fixes this
- export RUSTFLAGS="-C lto=thin"
.tmacos-aarch64: .tmacos-aarch64:
extends: extends:
- .tmacos - .tmacos
before_script: before_script:
- export PROFILE="release"
- *tmacos-before-script - *tmacos-before-script
- rustup target add aarch64-apple-darwin - rustup target add aarch64-apple-darwin
- export RUST_TARGET="aarch64-apple-darwin" - export RUST_TARGET="aarch64-apple-darwin"

4
Cargo.toml
View File

@ -97,6 +97,10 @@ debug = 1
[profile.release.package."veloren-world"] [profile.release.package."veloren-world"]
debug = 1 debug = 1
[profile.release-thinlto]
inherits = 'release'
lto = "thin"
# used for cargo bench # used for cargo bench
[profile.bench] [profile.bench]
opt-level = 2 opt-level = 2