Skip to content

Commit 515005c

Browse files
committed
truly static iodbc link
1 parent a2ad7bb commit 515005c

File tree

4 files changed

+13
-9
lines changed

4 files changed

+13
-9
lines changed

.cargo/config.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ LIBSQLITE3_FLAGS = "-DSQLITE_ENABLE_MATH_FUNCTIONS"
1010
rustflags = []
1111

1212
[target.x86_64-unknown-linux-gnu]
13-
rustflags = ["-C", "link-arg=-Wl,-rpath=$ORIGIN/sqlpage:$ORIGIN/lib"]
13+
rustflags = ["-C", "link-arg=-Wl,-rpath=$ORIGIN/sqlpage:$ORIGIN/sqlpage/drivers"]
1414

1515
[target.aarch64-unknown-linux-gnu]
16-
rustflags = ["-C", "link-arg=-Wl,-rpath=$ORIGIN/sqlpage:$ORIGIN/lib"]
16+
rustflags = ["-C", "link-arg=-Wl,-rpath=$ORIGIN/sqlpage:$ORIGIN/sqlpage/drivers"]
1717

1818
[target.armv7-unknown-linux-gnueabihf]
19-
rustflags = ["-C", "link-arg=-Wl,-rpath=$ORIGIN/sqlpage:$ORIGIN/lib"]
19+
rustflags = ["-C", "link-arg=-Wl,-rpath=$ORIGIN/sqlpage:$ORIGIN/sqlpage/drivers"]

.github/workflows/ci.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,6 @@ jobs:
6464
- uses: actions/checkout@v4
6565
- name: Set up cargo cache
6666
uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
67-
- name: Install ODBC dependencies
68-
run: |
69-
sudo apt-get update
70-
sudo apt-get install -y unixodbc-dev freetds-dev
7167
- name: Setup ODBC for testing
7268
if: matrix.setup_odbc
7369
run: |

Cargo.lock

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,12 @@ openidconnect = { version = "4.0.0", default-features = false }
8686
encoding_rs = "0.8.35"
8787
odbc-sys = { version = "0.27", optional = true }
8888

89+
[target.'cfg(any(target_os = "linux", target_os = "macos"))'.dependencies]
90+
odbc-sys = { version = "0.27", optional = true, features = ["iodbc", "static"] }
91+
92+
[patch.crates-io]
93+
odbc-sys = { git = "https://github.com/sqlpage/odbc-sys", branch = "main" }
94+
8995
[build-dependencies]
9096
awc = { version = "3", features = ["rustls-0_23-webpki-roots"] }
9197
rustls = "0.23"

0 commit comments

Comments
 (0)