Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: p11-glue/p11-kit
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 607f59525de4462d782cf221539f708a9ccb8d24
Choose a base ref
..
head repository: p11-glue/p11-kit
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2652a3ffd704e207f21a95de1ca5c708358c08ae
Choose a head ref
Showing with 5 additions and 3 deletions.
  1. +4 −2 meson.build
  2. +1 −1 meson_options.txt
6 changes: 4 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
project('p11-kit', 'c', 'rust',
project('p11-kit', 'c',
version: '0.23.21',
meson_version: '>= 0.49')

@@ -64,7 +64,9 @@ if get_option('nls') and cc.has_header('libintl.h')
endif

conf.set10('ENABLE_RUSTC', get_option('rustc'))
rustc = meson.get_compiler('rust')
if get_option('rustc')
add_languages('rust')
endif

prefix = get_option('prefix')
datadir = get_option('datadir')
2 changes: 1 addition & 1 deletion meson_options.txt
Original file line number Diff line number Diff line change
@@ -67,5 +67,5 @@ option('test', type : 'boolean',
description : 'Enable building test programs')

option('rustc', type : 'boolean',
value : true,
value : false,
description : 'Enable hardening using Rust')