diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 930c9bb..1efe839 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -137,9 +137,9 @@ jobs: env: AR_x86_64_unknown_linux_gnu: x86_64-linux-gnu-ar CC_x86_64_unknown_linux_gnu: x86_64-linux-gnu-gcc - CFLAGS_x86_64_unknown_linux_gnu: -fPIC + CFLAGS: -fPIC CXX_x86_64_unknown_linux_gnu: x86_64-linux-gnu-g++ - CXXFLAGS_x86_64_unknown_linux_gnu: -fPIC + CXXFLAGS: -fPIC CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER: x86_64-linux-gnu-gcc CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS: -C link-arg=--sysroot=/opt/ruds-x64-sysroot -C link-arg=-Wl,-rpath,$ORIGIN -L native=/opt/ruds-x64-sysroot/usr/lib/x86_64-linux-gnu -L native=/opt/ruds-x64-sysroot/lib/x86_64-linux-gnu PKG_CONFIG_ALLOW_CROSS: "1" diff --git a/crates/bds-ui/tests/packaging_assets.rs b/crates/bds-ui/tests/packaging_assets.rs index 185b1dc..ffde105 100644 --- a/crates/bds-ui/tests/packaging_assets.rs +++ b/crates/bds-ui/tests/packaging_assets.rs @@ -148,8 +148,8 @@ fn tagged_releases_are_built_and_packaged_with_rust_tools() { "publish", "PKG_CONFIG_ALLOW_CROSS", "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER", - "CFLAGS_x86_64_unknown_linux_gnu: -fPIC", - "CXXFLAGS_x86_64_unknown_linux_gnu: -fPIC", + "CFLAGS: -fPIC", + "CXXFLAGS: -fPIC", ] { assert!( workflow.contains(required),