From 50fd84833d1b6d1ec423f646fccc912b1d033fa8 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Tue, 27 Jul 2021 13:38:50 +0100
Subject: [PATCH] sysroot: Use gcc-4.8, g++-4.8 for native x86_64 build too

This makes it consistent with what we do when building official
packages.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 build-aux/meson/scout.txt | 5 +++++
 sysroot/scout-builds.py   | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 build-aux/meson/scout.txt

diff --git a/build-aux/meson/scout.txt b/build-aux/meson/scout.txt
new file mode 100644
index 000000000..bf935d84a
--- /dev/null
+++ b/build-aux/meson/scout.txt
@@ -0,0 +1,5 @@
+# Copyright 2021 Collabora Ltd.
+# SPDX-License-Identifier: MIT
+[binaries]
+c = '/usr/bin/gcc-4.8'
+cpp = '/usr/bin/g++-4.8'
diff --git a/sysroot/scout-builds.py b/sysroot/scout-builds.py
index c763acc4f..1278b71f7 100755
--- a/sysroot/scout-builds.py
+++ b/sysroot/scout-builds.py
@@ -61,6 +61,7 @@ def setup(args):
         [
             'meson',
         ] + common_options + [
+            '--native-file=build-aux/meson/scout.txt',
             os.path.join(args.abs_builddir_parent, 'scout-x86_64')
         ] + list(args.args),
         cwd=args.abs_srcdir,
-- 
GitLab