[gnome-build-meta/tristan/fdsdk-master: 19/19] project.conf: Set --build and --host more strictly

[Tristan Van Berkom <tvb src gnome org>]

commit 450e8f2567f2183d58d3c473097060dabeeff724
Author: Tristan Van Berkom <tristan vanberkom codethink co uk>
Date:   Wed Jun 12 19:27:40 2019 +0900

    project.conf: Set --build and --host more strictly
    
    Ensure that we set both --build and --host triplets in autotools
    builds for all architectures.

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