[gnome-build-meta] Revert "project.conf: Set --build and --host more strictly"

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 562c9fd6bbb0968c2f27dfcb38836d6845ad312c
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Sat Jun 22 12:45:40 2019 -0500

    Revert "project.conf: Set --build and --host more strictly"
    
    This reverts commit 6a8780906d3f9236be8151552b371980c1fab221.

 project.conf | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/project.conf b/project.conf
index be235c90..c25b6295 100644
--- a/project.conf
+++ b/project.conf
@@ -100,7 +100,14 @@ environment:
 elements:
   autotools:
     variables:
-      conf-global: --disable-static --disable-Werror --host=%{triplet} --build=%{triplet}
+      target: ''
+      (?):
+      - arch == "i686":
+          target: --host=i686-unknown-linux-gnu
+      - arch == "arm":
+          target: --host=arm-unknown-linux-gnueabi
+
+      conf-global: --disable-static --disable-Werror %{target}
 
       # Temporary workaround to avoid regenerating existing
       # configure scripts when building tarballs.
@@ -228,7 +235,6 @@ variables:
   gcc_arch: "%{arch}"
   abi: "gnu"
   gcc_triplet: "%{gcc_arch}-linux-%{abi}"
-  triplet: "%{arch}-unknown-linux-%{abi}"
   lib: "lib/%{gcc_triplet}"
   sbindir: "%{bindir}"
   sysconfdir: "/etc"