Skip to content

Commit dde0613

Browse files
nipunn1313Convex, Inc.
authored and
Convex, Inc.
committed
Unset the dynamic linking compiler optimizations in precompile (#24195)
Since we're building a precompiled binary, we want the full binary statically linked. GitOrigin-RevId: 294e35084e3c023caa9b410ddec36155d3e6147d
1 parent aef1781 commit dde0613

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

.github/actions/setup-rust/action.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@ runs:
1919
if: runner.os == 'Linux'
2020
run: sudo apt-get install pkg-config libsodium-dev
2121

22-
- name: Install libsodium and pkg-config
23-
shell: bash
24-
env:
25-
HOMEBREW_NO_AUTO_UPDATE: 1
26-
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
27-
if: runner.os == 'MacOS'
28-
run: brew install pkg-config libsodium rocksdb
29-
3022
- name: Install Just
3123
uses: extractions/setup-just@v1
3224
env:
@@ -49,10 +41,6 @@ runs:
4941
echo "SODIUM_USE_PKG_CONFIG=1" >> $GITHUB_ENV
5042
echo "ROCKSDB_LIB_DIR=/usr/lib" >> $GITHUB_ENV
5143
fi
52-
if [ "$RUNNER_OS" == "MacOS" ]; then
53-
echo "SODIUM_USE_PKG_CONFIG=1" >> $GITHUB_ENV
54-
echo "ROCKSDB_LIB_DIR=$(ls -d /usr/local/Cellar/rocksdb/*/lib)" >> $GITHUB_ENV
55-
fi
5644
echo "SCCACHE_ENDPOINT=https://a4aa0fffebef8bc497f64875c40ee6fb.r2.cloudflarestorage.com" >> $GITHUB_ENV
5745
echo "SCCACHE_BUCKET=cvx-actions-cache" >> $GITHUB_ENV
5846
echo "SCCACHE_REGION=auto" >> $GITHUB_ENV

.github/workflows/precompile.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,11 @@ jobs:
6666
just rush build
6767
6868
- name: Build backend
69-
run: cargo build --release -p local_backend --bin convex-local-backend
69+
run: |
70+
unset ROCKSDB_LIB_DIR
71+
unset SODIUM_USE_PKG_CONFIG
72+
unset SNAPPY_LIB_DIR
73+
cargo build --release -p local_backend --bin convex-local-backend
7074
7175
- name: Zip backend into arch
7276
run: |

0 commit comments

Comments
 (0)