Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix compilation for target wasm32-wasi #1321

Merged
merged 1 commit into from
May 7, 2023
Merged

fix compilation for target wasm32-wasi #1321

merged 1 commit into from
May 7, 2023

Conversation

wasm-forge
Copy link

@wasm-forge wasm-forge commented May 2, 2023

This PR partially reverts #961 that has introduced a bug in detection of wasm32-wasi target. That PR replaced the check of TARGET with a check of CARGO_CFG_TARGET_ENV. That however is incorrect because wasm32-wasi is a CPU architecture target (similar to x86 and armv8) and not an operating system.

This PR only affects wasm32-wasi compilation and is a no-op for other targets.

@gwenn
Copy link
Collaborator

gwenn commented May 2, 2023

See #1116 and #1289

@wasm-forge
Copy link
Author

@gwenn, thanks for the reply and linking the existing attempts to fix the bug. I apologize for sending a PR with an empty description. I fixed it now.

The bug was introduced in 5511a12?diff=split#diff-c1c013e096409a5aea1f123c04254379057791785963eba5ef253fdd686570b8L120

My PR reverts the change that introduced the bug. I verified locally that wasm32-wasi works locally after this partial revert.

My fix looks very similar to PR #1116, but it doesn't have the || is_compiler(..) part which is superfluous. If you would like to proceed with PR #1116, I am happy to close my PR and continue the work in #1116.

The PR #1289 is incorrect because it is changing the definition of is_compiler().

@gwenn
Copy link
Collaborator

gwenn commented May 7, 2023

Thanks for the explanation.

@gwenn gwenn removed the help wanted label May 7, 2023
@codecov
Copy link

codecov bot commented May 7, 2023

Codecov Report

Patch coverage: 100.00% and no project coverage change.

Comparison is base (051dcf6) 80.48% compared to head (ef4a0ac) 80.48%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #1321   +/-   ##
=======================================
  Coverage   80.48%   80.48%           
=======================================
  Files          49       49           
  Lines        9946     9946           
=======================================
  Hits         8005     8005           
  Misses       1941     1941           
Impacted Files Coverage Δ
libsqlite3-sys/build.rs 64.57% <100.00%> (ø)

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@gwenn gwenn merged commit 1a82396 into rusqlite:master May 7, 2023
16 checks passed
bors added a commit to rust-lang/cargo that referenced this pull request Dec 1, 2023
chore(deps): update rust crate rusqlite to 0.30.0

[![Mend Renovate logo banner](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [rusqlite](https://togithub.com/rusqlite/rusqlite) | workspace.dependencies | minor | `0.29.0` -> `0.30.0` |

---

### Release Notes

<details>
<summary>rusqlite/rusqlite (rusqlite)</summary>

### [`v0.30.0`](https://togithub.com/rusqlite/rusqlite/releases/tag/v0.30.0): 0.30.0

[Compare Source](https://togithub.com/rusqlite/rusqlite/compare/v0.29.0...v0.30.0)

#### What's Changed

-   Fix sqlite3\_auto_extension xEntryPoint signature [#&#8203;1310](https://togithub.com/rusqlite/rusqlite/issues/1310)
-   Use track_caller for panicking methods [#&#8203;1314](https://togithub.com/rusqlite/rusqlite/issues/1314)
-   Force linking against system sqlite libs [#&#8203;1317](https://togithub.com/rusqlite/rusqlite/issues/1317)
-   fix compilation for target wasm32-wasi [#&#8203;1321](https://togithub.com/rusqlite/rusqlite/issues/1321)
-   Add SQLITE_MAX_COLUMN compile-time option [#&#8203;1324](https://togithub.com/rusqlite/rusqlite/issues/1324)
-   Upgrade http links to https in Cargo.toml [#&#8203;1330](https://togithub.com/rusqlite/rusqlite/issues/1330)
-   Update fallible-iterator requirement from 0.2 to 0.3 [#&#8203;1334](https://togithub.com/rusqlite/rusqlite/issues/1334)
-   Implement FromSql & ToSql for std::num::NonZero types [#&#8203;1313](https://togithub.com/rusqlite/rusqlite/issues/1313)
-   Add new constants introduced by SQLite 3.42.0 [#&#8203;1336](https://togithub.com/rusqlite/rusqlite/issues/1336)
-   Use SQLITE_PREPARE_PERSISTENT for CachedStatement [#&#8203;1339](https://togithub.com/rusqlite/rusqlite/issues/1339)
-   Fix type of SQLITE_DESERIALIZE\_*, SQLITE_PREPARE\_*, SQLITE_SERIALIZE_\* [#&#8203;1340](https://togithub.com/rusqlite/rusqlite/issues/1340)
-   Introduce to_sqlite_error [#&#8203;1345](https://togithub.com/rusqlite/rusqlite/issues/1345)
-   remove depth from Savepoint [#&#8203;1327](https://togithub.com/rusqlite/rusqlite/issues/1327)
-   Savepoint Drop bug [#&#8203;1347](https://togithub.com/rusqlite/rusqlite/issues/1347)
-   \[breaking change] Update edition from 2018 to 2021 [#&#8203;1267](https://togithub.com/rusqlite/rusqlite/issues/1267)
-   Remove msrv for clippy by [#&#8203;1351](https://togithub.com/rusqlite/rusqlite/issues/1351)
-   Tweak bindgen [#&#8203;1352](https://togithub.com/rusqlite/rusqlite/issues/1352), [#&#8203;1353](https://togithub.com/rusqlite/rusqlite/issues/1353)
-   Inline constraint_error_code [#&#8203;1359](https://togithub.com/rusqlite/rusqlite/issues/1359)
-   Simplify bindgen generation [#&#8203;1360](https://togithub.com/rusqlite/rusqlite/issues/1360)
-   Fixes generate_series to handle NULL arguments [#&#8203;1357](https://togithub.com/rusqlite/rusqlite/issues/1357)
-   Factorize code in build.rs [#&#8203;1361](https://togithub.com/rusqlite/rusqlite/issues/1361)
-   Serialize and deserialize database [#&#8203;1341](https://togithub.com/rusqlite/rusqlite/issues/1341)
-   Spelling and a few more nits [#&#8203;1373](https://togithub.com/rusqlite/rusqlite/issues/1373)
-   Implement support for more `time` types [#&#8203;1374](https://togithub.com/rusqlite/rusqlite/issues/1374)
-   Fix visibility of TransactionState [#&#8203;1384](https://togithub.com/rusqlite/rusqlite/issues/1384)
-   Column is used only with column_decltype feature [#&#8203;1385](https://togithub.com/rusqlite/rusqlite/issues/1385)
-   Use proper var names in trait definition [#&#8203;1398](https://togithub.com/rusqlite/rusqlite/issues/1398)
-   Fix clippy warning: arc_with_non_send_sync - interrupt_lock [#&#8203;1400](https://togithub.com/rusqlite/rusqlite/issues/1400)
-   Captured identifiers in SQL strings [#&#8203;1346](https://togithub.com/rusqlite/rusqlite/issues/1346)
-   Add new constants introduced by SQLite 3.43.0 [#&#8203;1405](https://togithub.com/rusqlite/rusqlite/issues/1405)
-   Make WindowAggregate::value pass mutable value ref [#&#8203;1395](https://togithub.com/rusqlite/rusqlite/issues/1395)
-   Bump bundled SQLite version to 3.44.0 [#&#8203;1409](https://togithub.com/rusqlite/rusqlite/issues/1409)
-   Bump bindgen version to 0.69 [#&#8203;1410](https://togithub.com/rusqlite/rusqlite/issues/1410)
-   Loadable extension [#&#8203;1362](https://togithub.com/rusqlite/rusqlite/issues/1362)

#### New Contributors

-   [`@&#8203;icp1994](https://togithub.com/icp1994)` made their first contribution in [rusqlite/rusqlite#1317
-   [`@&#8203;wasm-forge](https://togithub.com/wasm-forge)` made their first contribution in [rusqlite/rusqlite#1321
-   [`@&#8203;nopjia](https://togithub.com/nopjia)` made their first contribution in [rusqlite/rusqlite#1324
-   [`@&#8203;Benjins-automation](https://togithub.com/Benjins-automation)` made their first contribution in [rusqlite/rusqlite#1330
-   [`@&#8203;itsxaos](https://togithub.com/itsxaos)` made their first contribution in [rusqlite/rusqlite#1313
-   [`@&#8203;Taywee](https://togithub.com/Taywee)` made their first contribution in [rusqlite/rusqlite#1327
-   [`@&#8203;davidselassie](https://togithub.com/davidselassie)` made their first contribution in [rusqlite/rusqlite#1357
-   [`@&#8203;nyurik](https://togithub.com/nyurik)` made their first contribution in [rusqlite/rusqlite#1373
-   [`@&#8203;nydrani](https://togithub.com/nydrani)` made their first contribution in [rusqlite/rusqlite#1374

**Full Changelog**: rusqlite/rusqlite@v0.29.0...v0.30.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "before 5am on the first day of the month" (UTC), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/rust-lang/cargo).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy41OS44IiwidXBkYXRlZEluVmVyIjoiMzcuNTkuOCIsInRhcmdldEJyYW5jaCI6Im1hc3RlciJ9-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants