From cf566866bad0e7acb059e644b7b3a2f55dafcd6d Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Tue, 28 Jul 2020 17:23:33 +0200 Subject: [PATCH] meson: drop incomplete conversion error and option Now that the rewrite is complete it is safe to drop this option and the corresponding error message. Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- meson.build | 5 ----- meson_options.txt | 1 - 2 files changed, 6 deletions(-) diff --git a/meson.build b/meson.build index 22515f1daf..48b937d6bb 100644 --- a/meson.build +++ b/meson.build @@ -12,11 +12,6 @@ project( ) -if not get_option('force_incomplete_build') - error('This commit is part of the meson conversion and does not build a complete libvirt. If bisecting, use "git bisect skip" to continue, or "-Dforce_incomplete_build=true" to perform a partial build.') -endif - - # figure out if we are building from git git = run_command('test', '-d', '.git').returncode() == 0 diff --git a/meson_options.txt b/meson_options.txt index d27a4755b1..a1bb6505b8 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,4 +1,3 @@ -option('force_incomplete_build', type: 'boolean', value: false, description: 'Meson setup fails by default until the rewrite to meson is done, set this to "true" to force the build.') option('no_git', type: 'boolean', value: false, description: 'Disable git submodule update') option('packager', type: 'string', value: '', description: 'Extra packager name') option('packager_version', type: 'string', value: '', description: 'Extra packager version')