diff --git a/.pick_status.json b/.pick_status.json index 6e5a6e496b3..23c2cd4d613 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1974,7 +1974,7 @@ "description": "nak: Add minimum bindgen requirement", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "944365802f8ef53e37db38f15f2c2dc6b820d132", "notes": null diff --git a/src/nouveau/compiler/meson.build b/src/nouveau/compiler/meson.build index 60c7fc7b074..d8deb75fcb8 100644 --- a/src/nouveau/compiler/meson.build +++ b/src/nouveau/compiler/meson.build @@ -12,6 +12,21 @@ if rc.version().version_compare('< 1.73.0') error('NAK requires Rust 1.73.0') endif +bindgen_version = find_program('bindgen').version() + +if bindgen_version == 'unknown' + error('Failed to detect bindgen version. If you are using bindgen 0.69.0, ' + + 'please either update to 0.69.1 or downgrade to 0.68.1. You can ' + + 'install the latest version for your user with ` + + ``cargo install bindgen-cli`.') +endif + +if bindgen_version.version_compare('< 0.65') + error('NAK requires bindgen 0.65 or newer. If your distribution does not ' + + 'ship a recent enough version, you can install the latest version ' + + 'for your user with `cargo install bindgen-cli`.') +endif + nak_rust_args = [ '-Aclippy::identity_op', '-Aclippy::len_zero',