[gnome-build-meta/abderrahim/webkit-python3: 2/5] project.conf: set autotools cross-compile options globally

[Jordan Petridis <jpetridis src gnome org>]

commit eec7fedfe2aeac2d289463b8968835f9de4424ec
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Fri Dec 21 07:23:41 2018 +0100

    project.conf: set autotools cross-compile options globally

 elements/core-deps/mozjs52.bst | 8 +-------
 project.conf                   | 9 ++++++++-
 2 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/elements/core-deps/mozjs52.bst b/elements/core-deps/mozjs52.bst
index fa9dcba9..24dfbdc1 100644
--- a/elements/core-deps/mozjs52.bst
+++ b/elements/core-deps/mozjs52.bst
@@ -13,14 +13,8 @@ depends:
   junction: freedesktop-sdk.bst
 variables:
   mozjs_target: ''
-  (?):
-    - arch == "i686":
-        mozjs_target: "--host=i686-unknown-linux-gnu"
-    - arch == "arm":
-        mozjs_target: "--host=arm-unknown-linux-gnueabi"
   command-subdir: _build
-  conf-local: --enable-posix-nspr-emulation --with-system-zlib --with-intl-api --disable-jemalloc 
%{mozjs_target}
-    AUTOCONF=autoconf
+  conf-local: --enable-posix-nspr-emulation --with-system-zlib --with-intl-api --disable-jemalloc 
AUTOCONF=autoconf
   conf-cmd: '%{build-root}/js/src/configure'
   # not a real autotools project
   autogen: ''
diff --git a/project.conf b/project.conf
index 5195937c..e8de8b0d 100644
--- a/project.conf
+++ b/project.conf
@@ -98,7 +98,14 @@ environment:
 elements:
   autotools:
     variables:
-      conf-extra: --disable-static --disable-Werror
+      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.