Miscellaneous changes #266

Merged
lucas merged 49 commits from feat/misc into master 2025-07-02 16:25:44 +02:00
4 changed files with 36 additions and 23 deletions
Showing only changes of commit e0baa55c2c - Show all commits

View file

@ -15,10 +15,14 @@ jobs:
- template: ci/azure-test-all.yml
strategy:
matrix:
stable:
TOOLCHAIN: stable
nightly:
TOOLCHAIN: nightly
stable-x86_64-msvc:
TOOLCHAIN: stable-x86_64-pc-windows-msvc
# stable-x86_64-gnu:
# TOOLCHAIN: stable-x86_64-pc-windows-gnu
# stable-i686-msvc:
# TOOLCHAIN: stable-i686-pc-windows-msvc
# stable-i686-gnu:
# TOOLCHAIN: stable-i686-pc-windows-gnu
- job: Linux
pool:
@ -28,9 +32,11 @@ jobs:
- template: ci/azure-test-all.yml
strategy:
matrix:
stable:
TOOLCHAIN: stable
nightly:
stable-x86_64:
TOOLCHAIN: stable-x86_64-unknown-linux-gnu
# stable-i686:
# TOOLCHAIN: stable-i686-unknown-linux-gnu
nightly-x86_64:
TOOLCHAIN: nightly
- job: MacOS
@ -41,7 +47,5 @@ jobs:
- template: ci/azure-test-all.yml
strategy:
matrix:
stable:
TOOLCHAIN: stable
nightly:
TOOLCHAIN: nightly
stable-x86_64:
TOOLCHAIN: stable-x86_64-apple-darwin

View file

@ -63,6 +63,11 @@ fn main() {
buildcmd.current_dir(&src_dir);
buildcmd.stderr(Stdio::inherit());
if cfg!(target_pointer_width = "32") {
buildcmd.env("HOST_CC", "gcc -m32");
buildcmd.arg("-e");
}
let mut child = buildcmd.spawn().expect("failed to run make");
if !child
@ -77,4 +82,8 @@ fn main() {
println!("cargo:rustc-link-search=native={}", src_dir);
println!("cargo:rustc-link-lib=static=luajit");
}
// if cfg!(target_os = "macos") && cfg!(target_pointer_width = "64") {
// // RUSTFLAGS='-C link-args=-pagezero_size 10000 -image_base 100000000'
// }
}

View file

@ -7,19 +7,9 @@ steps:
rustup --version
displayName: Install rustup
condition: eq(variables['Agent.OS'], 'Darwin')
# - script: |
# echo %TOOLCHAIN%
# curl -sSf -o rustup-init.exe https://win.rustup.rs
# rustup-init.exe -v -y --default-toolchain %TOOLCHAIN%
# echo ##vso[task.prependpath]%USERPROFILE%\.cargo\bin
# rustup default %TOOLCHAIN%
# rustup component add rustfmt
# displayName: Install rust (windows)
# condition: eq(variables['Agent.OS'], 'Windows_NT')
- bash: |
set -x
set -e -x
rustup --version
rustup component remove --toolchain $TOOLCHAIN rust-docs || true
rustup default $TOOLCHAIN
rustup update --no-self-update $TOOLCHAIN
rustup toolchain install stable

View file

@ -1,6 +1,16 @@
steps:
- checkout: self
submodules: true
# - script: |
# call "C:\Program Files (x86)\Microsoft Visual Studio\2017\VC\Auxiliary\Build\vcvarsall.bat" x86
# displayName: Call vcvarsalls.bat x86
# condition: eq(variables['TOOLCHAIN'], 'stable-i686-pc-windows-msvc')
# - bash: pacman -Syu
# condition: eq(variables['TOOLCHAIN'], 'stable-x86_64-pc-windows-gnu')
# displayName: Update msys
# - bash: sudo apt install gcc-multilib
# condition: eq(variables['TOOLCHAIN'], 'stable-i686-unknown-linux-gnu')
# displayName: Install gcc-multilib
- bash: |
set -e -x
cargo +stable fmt --all -- --check
@ -22,5 +32,5 @@ steps:
- bash: |
pwd
find ./target
displayName: List files in ./target
displayName: List files in target
condition: always()