clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-24 14:45:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use clang++ for musl C++ headers

Browse Source
This commit is contained in:
viyatb-oai
2026-01-19 22:15:49 -08:00
parent 5d6611170b
commit 57c971470d
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/rust-ci.yml vendored
View File

@@ -269,7 +269,7 @@ jobs:
run: |
set -euo pipefail
sudo apt-get -y update -o Acquire::Retries=3
sudo apt-get -y install --no-install-recommends musl-tools pkg-config g++
sudo apt-get -y install --no-install-recommends musl-tools pkg-config g++ clang libc++-dev libc++abi-dev lld
case "${{ matrix.target }}" in
x86_64-unknown-linux-musl)
arch="x86_64"
@@ -282,7 +282,10 @@ jobs:
exit 1
;;
esac
if command -v "${arch}-linux-musl-g++" >/dev/null; then
if command -v clang++ >/dev/null; then
cxx="$(command -v clang++)"
echo "CXXFLAGS=--target=${{ matrix.target }} -stdlib=libc++" >> "$GITHUB_ENV"
elif command -v "${arch}-linux-musl-g++" >/dev/null; then
cxx="$(command -v "${arch}-linux-musl-g++")"
elif command -v musl-g++ >/dev/null; then
cxx="$(command -v musl-g++)"

7
.github/workflows/rust-release.yml vendored
View File

@@ -99,7 +99,7 @@ jobs:
run: |
set -euo pipefail
sudo apt-get update
sudo apt-get install -y musl-tools pkg-config g++
sudo apt-get install -y musl-tools pkg-config g++ clang libc++-dev libc++abi-dev lld
case "${{ matrix.target }}" in
x86_64-unknown-linux-musl)
arch="x86_64"
@@ -112,7 +112,10 @@ jobs:
exit 1
;;
esac
if command -v "${arch}-linux-musl-g++" >/dev/null; then
if command -v clang++ >/dev/null; then
cxx="$(command -v clang++)"
echo "CXXFLAGS=--target=${{ matrix.target }} -stdlib=libc++" >> "$GITHUB_ENV"
elif command -v "${arch}-linux-musl-g++" >/dev/null; then
cxx="$(command -v "${arch}-linux-musl-g++")"
elif command -v musl-g++ >/dev/null; then
cxx="$(command -v musl-g++)"

7
.github/workflows/shell-tool-mcp.yml vendored
View File

@@ -102,7 +102,7 @@ jobs:
run: |
set -euo pipefail
sudo apt-get update
sudo apt-get install -y musl-tools pkg-config g++
sudo apt-get install -y musl-tools pkg-config g++ clang libc++-dev libc++abi-dev lld
case "${{ matrix.target }}" in
x86_64-unknown-linux-musl)
arch="x86_64"
@@ -115,7 +115,10 @@ jobs:
exit 1
;;
esac
if command -v "${arch}-linux-musl-g++" >/dev/null; then
if command -v clang++ >/dev/null; then
cxx="$(command -v clang++)"
echo "CXXFLAGS=--target=${{ matrix.target }} -stdlib=libc++" >> "$GITHUB_ENV"
elif command -v "${arch}-linux-musl-g++" >/dev/null; then
cxx="$(command -v "${arch}-linux-musl-g++")"
elif command -v musl-g++ >/dev/null; then
cxx="$(command -v musl-g++)"