meson, bump version (#3821)

This commit is contained in:
Schrijvers Luc
2019-05-01 20:40:44 +02:00
committed by waddlesplash
parent 2c679373c6
commit 65393d310b
2 changed files with 3 additions and 29 deletions

View File

@@ -1,25 +0,0 @@
From 9737a81fbcd3ff9471868393735c703335bb9963 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 12 Mar 2019 03:39:42 +0100
Subject: [PATCH] Properly detect 'bepc' as 'x86' CPU for Haiku
---
mesonbuild/environment.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 08324632..74ce058c 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -204,6 +204,8 @@ def detect_cpu_family(compilers):
trial = platform.machine().lower()
if trial.startswith('i') and trial.endswith('86'):
trial = 'x86'
+ elif trial == 'bepc':
+ trial = 'x86'
elif trial.startswith('arm'):
trial = 'arm'
elif trial.startswith('ppc64'):
--
2.20.1