_pipeline.py: Removing arches

Also now the integration option to `bst checkout` is explicit,
as we dont have knowledge of arches anymore.

1 files changed, 4 insertions, 12 deletions

diff --git a/buildstream/_pipeline.py b/buildstream/_pipeline.py
index 69121a971..fcecd0d67 100644
--- a/buildstream/_pipeline.py
+++ b/buildstream/_pipeline.py
@@ -139,8 +139,7 @@ class Pipeline():
         self.unused_workspaces = []
 
         loader = Loader(self.project.element_path, target,
-                        self.project._options,
-                        context.host_arch, context.target_arch)
+                        self.project._options)
         meta_element = loader.load(rewritable, load_ticker)
         if load_ticker:
             load_ticker(None)
@@ -461,8 +460,9 @@ class Pipeline():
     # Args:
     #    directory (str): The directory to checkout the artifact to
     #    force (bool): Force overwrite files which exist in `directory`
+    #    integrate (bool): Whether to run integration commands
     #
-    def checkout(self, directory, force):
+    def checkout(self, directory, force, integrate):
         try:
             os.makedirs(directory, exist_ok=True)
         except OSError as e:
@@ -475,16 +475,8 @@ class Pipeline():
             raise PipelineError("Checkout directory is not empty: {}"
                                 .format(directory))
 
-        # BuildStream will one day be able to run host-incompatible binaries
-        # by using a QEMU sandbox, but for now we need to disable integration
-        # commands for cross-build artifacts.
-        can_integrate = (self.context.host_arch == self.context.target_arch)
-        if not can_integrate:
-            self.message(MessageType.WARN,
-                         "Host-incompatible checkout -- no integration commands can be run")
-
         # Stage deps into a temporary sandbox first
-        with self.target._prepare_sandbox(Scope.RUN, None, integrate=can_integrate) as sandbox:
+        with self.target._prepare_sandbox(Scope.RUN, None, integrate=integrate) as sandbox:
 
             # Make copies from the sandbox into to the desired directory
             sandbox_root = sandbox.get_directory()