[gnome-builder] flatpak: get proper arch from pipeline



commit 2a84d14824e8b96c41e58b49b90195b4c63bd4af
Author: Christian Hergert <chergert redhat com>
Date:   Thu Mar 14 11:05:25 2019 -0700

    flatpak: get proper arch from pipeline
    
    We may not have the right info from the toolchain yet, so rely
    on the pipeline specifically for the arch it wants.

 src/plugins/flatpak/gbp-flatpak-runtime-provider.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
---
diff --git a/src/plugins/flatpak/gbp-flatpak-runtime-provider.c 
b/src/plugins/flatpak/gbp-flatpak-runtime-provider.c
index 02a7047fe..671886da6 100644
--- a/src/plugins/flatpak/gbp-flatpak-runtime-provider.c
+++ b/src/plugins/flatpak/gbp-flatpak-runtime-provider.c
@@ -631,9 +631,7 @@ gbp_flatpak_runtime_provider_bootstrap_async (IdeRuntimeProvider  *provider,
   g_autofree gchar *arch = NULL;
   g_autofree gchar *branch = NULL;
   g_autoptr(IdeTask) task = NULL;
-  g_autoptr(IdeTriplet) triplet = NULL;
   IdeConfig *config;
-  IdeToolchain *toolchain;
   BootstrapState *state;
   const gchar *runtime_id;
   const gchar *build_arch;
@@ -648,9 +646,7 @@ gbp_flatpak_runtime_provider_bootstrap_async (IdeRuntimeProvider  *provider,
   ide_task_set_source_tag (task, gbp_flatpak_runtime_provider_bootstrap_async);
   ide_task_set_priority (task, G_PRIORITY_LOW);
 
-  toolchain = ide_pipeline_get_toolchain (pipeline);
-  triplet = ide_toolchain_get_host_triplet (toolchain);
-  build_arch = ide_triplet_get_arch (triplet);
+  build_arch = ide_pipeline_get_arch (pipeline);
   config = ide_pipeline_get_config (pipeline);
   runtime_id = ide_config_get_runtime_id (config);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]