--run: bind-mount both /run/build and /run/build-runtime

We need /run/build-runtime if what we're building was a runtime, and
its not clear what we're building, so just bind both.
auto
Alexander Larsson 2018-04-23 14:19:26 +02:00
parent e779d3c485
commit ed2eabc65b
1 changed files with 3 additions and 3 deletions

View File

@ -3706,9 +3706,9 @@ builder_manifest_run (BuilderManifest *self,
g_ptr_array_add (args, g_strdup ("--with-appdir"));
build_dir_path = g_file_get_path (builder_context_get_build_dir (context));
g_ptr_array_add (args, g_strdup_printf ("--bind-mount=/run/%s=%s",
builder_context_get_build_runtime (context) ? "build-runtime" : "build",
build_dir_path));
/* We're not sure what we're building here, so lets set both the /run/build and /run/build-runtime dirs to the build dirs */
g_ptr_array_add (args, g_strdup_printf ("--bind-mount=/run/build=%s", build_dir_path));
g_ptr_array_add (args, g_strdup_printf ("--bind-mount=/run/build-runtime=%s", build_dir_path));
if (g_file_query_exists (builder_context_get_ccache_dir (context), NULL))
{