mirrors/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-28 02:11:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

codex: fix macOS nm lookup in Bazel patch

Browse Source 
Co-authored-by: Codex <noreply@openai.com>
This commit is contained in:
Ahmed Ibrahim
2026-04-04 22:08:52 -07:00
parent 61287801a5
commit 4d326f2127
1 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
patches/webrtc-audio-processing-sys_meson_env.patch
View File

@@ -1,5 +1,5 @@
diff --git a/build.rs b/build.rs
index 8578e92..e51138c 100644
index 8578e9220a..320639f441 100644
--- a/build.rs
+++ b/build.rs
@@ -1,10 +1,14 @@
@@ -194,7 +194,7 @@ index 8578e92..e51138c 100644
}
let stdout = String::from_utf8_lossy(&output.stdout);
@@ -461,3 +594,64 @@ fn determine_objcopy_path() -> Result<PathBuf> {
@@ -461,3 +594,95 @@ fn determine_objcopy_path() -> Result<PathBuf> {
Ok(objcopy)
}
@@ -231,9 +231,33 @@ index 8578e92..e51138c 100644
+ return nm.into();
+ }
+
+ #[cfg(target_os = "macos")]
+ {
+ let xcrun_output = Command::new("/usr/bin/xcrun")
+ .args(["--find", "llvm-nm"])
+ .output();
+ if let Ok(output) = xcrun_output {
+ if output.status.success() {
+ let path = String::from_utf8_lossy(&output.stdout).trim().to_owned();
+ if !path.is_empty() {
+ return PathBuf::from(path);
+ }
+ }
+ }
+ }
+
+ for tool_env in ["AR", "CC", "CXX"] {
+ if let Some(tool_path) = env::var_os(tool_env) {
+ let tool_path = PathBuf::from(tool_path);
+ if let Some(parent) = tool_path.parent() {
+ for candidate_name in ["llvm-nm", "nm"] {
+ let candidate = parent.join(candidate_name);
+ if candidate.exists() {
+ return candidate;
+ }
+ }
+ }
+
+ if let Some(file_name) = tool_path.file_name().and_then(|name| name.to_str()) {
+ let candidate_name = file_name.replace("llvm-ar", "llvm-nm");
+ if candidate_name != file_name {
@@ -242,6 +266,13 @@ index 8578e92..e51138c 100644
+ return candidate;
+ }
+ }
+
+ if file_name != "llvm-nm" {
+ let candidate = tool_path.with_file_name("llvm-nm");
+ if candidate.exists() {
+ return candidate;
+ }
+ }
+ }
+ }
+ }