mirror of
https://github.com/openai/codex.git
synced 2026-08-23 13:09:46 +00:00
build(linux-sandbox): always compile vendored bubblewrap on Linux; remove CODEX_BWRAP_ENABLE_FFI (#11498)
## Summary This PR removes the temporary `CODEX_BWRAP_ENABLE_FFI` flag and makes Linux builds always compile vendored bubblewrap support for `codex-linux-sandbox`. ## Changes - Removed `CODEX_BWRAP_ENABLE_FFI` gating from `codex-rs/linux-sandbox/build.rs`. - Linux builds now fail fast if vendored bubblewrap compilation fails (instead of warning and continuing). - Updated fallback/help text in `codex-rs/linux-sandbox/src/vendored_bwrap.rs` to remove references to `CODEX_BWRAP_ENABLE_FFI`. - Removed `CODEX_BWRAP_ENABLE_FFI` env wiring from: - `.github/workflows/rust-ci.yml` - `.github/workflows/bazel.yml` - `.github/workflows/rust-release.yml` --------- Co-authored-by: David Zbarsky <zbarsky@openai.com>
This commit is contained in:
8
defs.bzl
8
defs.bzl
@@ -35,9 +35,11 @@ def codex_rust_crate(
|
||||
crate_srcs = None,
|
||||
crate_edition = None,
|
||||
proc_macro = False,
|
||||
build_script_enabled = True,
|
||||
build_script_data = [],
|
||||
compile_data = [],
|
||||
lib_data_extra = [],
|
||||
rustc_flags_extra = [],
|
||||
rustc_env = {},
|
||||
deps_extra = [],
|
||||
integration_deps_extra = [],
|
||||
@@ -97,7 +99,7 @@ def codex_rust_crate(
|
||||
|
||||
lib_srcs = crate_srcs or native.glob(["src/**/*.rs"], exclude = binaries.values(), allow_empty = True)
|
||||
|
||||
if native.glob(["build.rs"], allow_empty = True):
|
||||
if build_script_enabled and native.glob(["build.rs"], allow_empty = True):
|
||||
cargo_build_script(
|
||||
name = name + "-build-script",
|
||||
srcs = ["build.rs"],
|
||||
@@ -122,6 +124,7 @@ def codex_rust_crate(
|
||||
data = lib_data_extra,
|
||||
srcs = lib_srcs,
|
||||
edition = crate_edition,
|
||||
rustc_flags = rustc_flags_extra,
|
||||
rustc_env = rustc_env,
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
@@ -132,6 +135,7 @@ def codex_rust_crate(
|
||||
env = test_env,
|
||||
deps = deps + dev_deps,
|
||||
proc_macro_deps = proc_macro_deps + proc_macro_dev_deps,
|
||||
rustc_flags = rustc_flags_extra,
|
||||
rustc_env = rustc_env,
|
||||
data = test_data_extra,
|
||||
tags = test_tags,
|
||||
@@ -155,6 +159,7 @@ def codex_rust_crate(
|
||||
deps = maybe_lib + deps,
|
||||
proc_macro_deps = proc_macro_deps,
|
||||
edition = crate_edition,
|
||||
rustc_flags = rustc_flags_extra,
|
||||
srcs = native.glob(["src/**/*.rs"]),
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
@@ -177,6 +182,7 @@ def codex_rust_crate(
|
||||
compile_data = native.glob(["tests/**"], allow_empty = True) + integration_compile_data_extra,
|
||||
deps = maybe_lib + deps + dev_deps + integration_deps_extra,
|
||||
proc_macro_deps = proc_macro_deps + proc_macro_dev_deps,
|
||||
rustc_flags = rustc_flags_extra,
|
||||
rustc_env = rustc_env,
|
||||
env = test_env | cargo_env,
|
||||
tags = test_tags,
|
||||
|
||||
Reference in New Issue
Block a user