diff --git a/docker/Dockerfile.cargo.deps b/docker/Dockerfile.cargo.deps index accd8e96..d21db7a2 100644 --- a/docker/Dockerfile.cargo.deps +++ b/docker/Dockerfile.cargo.deps @@ -13,13 +13,12 @@ ARG cargo_target_artifact ARG cargo_target_share ARG CARGO_BUILD_RUSTFLAGS ARG CARGO_PROFILE_TEST_DEBUG -ARG CARGO_PROFILE_TEST_BUILD_OVERRIDE_DEBUG ARG CARGO_PROFILE_TEST_INCREMENTAL ARG CARGO_PROFILE_BENCH_DEBUG -ARG CARGO_PROFILE_BENCH_BUILD_OVERRIDE_DEBUG ARG CARGO_PROFILE_BENCH_LTO -ARG CARGO_PROFILE_RELEASE_BUILD_OVERRIDE_DEBUG ARG CARGO_PROFILE_RELEASE_LTO +ARG CARGO_PROFILE_RELEASE_DEBUGINFO_DEBUG +ARG CARGO_PROFILE_RELEASE_DEBUGINFO_LTO ARG cargo_profile ARG cargo_features ARG cargo_spec_features @@ -36,13 +35,12 @@ WORKDIR /usr/src/tuwunel COPY --link --from=recipe recipe.json . ENV CARGO_PROFILE_TEST_DEBUG="${CARGO_PROFILE_TEST_DEBUG}" -ENV CARGO_PROFILE_TEST_BUILD_OVERRIDE_DEBUG="${CARGO_PROFILE_TEST_BUILD_OVERRIDE_DEBUG}" ENV CARGO_PROFILE_TEST_INCREMENTAL="${CARGO_PROFILE_TEST_INCREMENTAL}" ENV CARGO_PROFILE_BENCH_DEBUG="${CARGO_PROFILE_BENCH_DEBUG}" -ENV CARGO_PROFILE_BENCH_BUILD_OVERRIDE_DEBUG="${CARGO_PROFILE_BENCH_BUILD_OVERRIDE_DEBUG}" ENV CARGO_PROFILE_BENCH_LTO="${CARGO_PROFILE_BENCH_LTO}" -ENV CARGO_PROFILE_RELEASE_BUILD_OVERRIDE_DEBUG="${CARGO_PROFILE_RELEASE_BUILD_OVERRIDE_DEBUG}" ENV CARGO_PROFILE_RELEASE_LTO="${CARGO_PROFILE_RELEASE_LTO}" +ENV CARGO_PROFILE_RELEASE_DEBUGINFO_DEBUG="${CARGO_PROFILE_RELEASE_DEBUGINFO_DEBUG}" +ENV CARGO_PROFILE_RELEASE_DEBUGINFO_LTO="${CARGO_PROFILE_RELEASE_DEBUGINFO_LTO}" ENV CARGO_BUILD_RUSTFLAGS="${CARGO_BUILD_RUSTFLAGS}" ENV CARGO_TARGET_DIR="${CARGO_TARGET_DIR}" ENV targ_dir="${CARGO_TARGET_DIR}/${cargo_target_profile}" diff --git a/docker/bake.hcl b/docker/bake.hcl index 67af092d..0c7966d0 100644 --- a/docker/bake.hcl +++ b/docker/bake.hcl @@ -1132,14 +1132,10 @@ target "deps-base" { ) CARGO_PROFILE_TEST_DEBUG = "false" - CARGO_PROFILE_TEST_BUILD_OVERRIDE_DEBUG = "false" CARGO_PROFILE_TEST_INCREMENTAL = "false" CARGO_PROFILE_BENCH_DEBUG = "limited" - CARGO_PROFILE_BENCH_BUILD_OVERRIDE_DEBUG = "false" CARGO_PROFILE_BENCH_LTO = "false" - CARGO_PROFILE_RELEASE_BUILD_OVERRIDE_DEBUG = "false" CARGO_PROFILE_RELEASE_LTO = "thin" - CARGO_PROFILE_RELEASE_DEBUGINFO_BUILD_OVERRIDE_DEBUG = "false" CARGO_PROFILE_RELEASE_DEBUGINFO_DEBUG = "limited" CARGO_PROFILE_RELEASE_DEBUGINFO_LTO = "off" @@ -1195,13 +1191,7 @@ target "deps-base" { join(" ", dynamic_rustflags), ]): - join(" ", [ - contains(split(",", cargo_feat_sets[feat_set]), "zstd_compression")? - "-Clink-arg=-lzstd": "", - contains(split(",", cargo_feat_sets[feat_set]), "io_uring")? - "-Clink-arg=-luring": "", - join(" ", dynamic_rustflags), - ]) + join(" ", []) ) } }