summaryrefslogtreecommitdiff
path: root/header_checks
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-06-21 16:45:40 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-06-21 17:32:43 +0200
commit799b39afc5b36ce78a4be0c62a04639d5075fc33 (patch)
treed53c451d3b05fe579a725e109ea381df801fb44e /header_checks
parent0c4c74b5f7779fbf5c6154b8241291041a8d86b7 (diff)
meson: do not error when no optimization architecture is there
this should fix building on architectures that do not have native optimization support in efl. fix T8028 Reviewed-by: Dan HorĂ¡k <@sharkcz> Differential Revision: https://phab.enlightenment.org/D9150
Diffstat (limited to 'header_checks')
-rw-r--r--header_checks/meson.build13
1 files changed, 9 insertions, 4 deletions
diff --git a/header_checks/meson.build b/header_checks/meson.build
index 2844e50f3c..8ead497882 100644
--- a/header_checks/meson.build
+++ b/header_checks/meson.build
@@ -1,4 +1,5 @@
1if get_option('native-arch-optimization') 1if get_option('native-arch-optimization')
2 check_native_header = true
2 if host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64' 3 if host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64'
3 native_header = 'immintrin.h' 4 native_header = 'immintrin.h'
4 elif host_machine.cpu_family() == 'arm' 5 elif host_machine.cpu_family() == 'arm'
@@ -7,13 +8,17 @@ if get_option('native-arch-optimization')
7 native_header = 'arm_neon.h' 8 native_header = 'arm_neon.h'
8 elif host_machine.cpu_family() == 'ppc' or host_machine.cpu_family() == 'ppc64' 9 elif host_machine.cpu_family() == 'ppc' or host_machine.cpu_family() == 'ppc64'
9 native_header = 'altivec.h' 10 native_header = 'altivec.h'
11 else
12 check_native_header = false
10 endif 13 endif
11 14
12 if cc.has_header(native_header) == false 15 if check_native_header
13 error('Error, header '+native_header+' is required') 16 if cc.has_header(native_header) == false
14 endif 17 error('Error, header '+native_header+' is required')
18 endif
15 19
16 config_h.set10('HAVE_'+native_header.underscorify().to_upper(), true) 20 config_h.set10('HAVE_'+native_header.underscorify().to_upper(), true)
21 endif
17endif 22endif
18 23
19header_checks = [ 24header_checks = [