From 65e447c5df484fcbdad41721e2aba46823147931 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 11 Jun 2018 10:15:15 -0700 Subject: meson: move cc and cpp definitions to top of main meson.build This just makes using cc and cpp easier. v2: - Add this patch to fix altivec Signed-off-by: Dylan Baker Reviewed-by: Eric Engestrom Reviewed-by: Matt Turner --- meson.build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 160bbfa30ba..16866d77ed3 100644 --- a/meson.build +++ b/meson.build @@ -29,6 +29,9 @@ project( default_options : ['buildtype=debugoptimized', 'c_std=c99', 'cpp_std=c++11'] ) +cc = meson.get_compiler('c') +cpp = meson.get_compiler('cpp') + null_dep = dependency('', required : false) system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly', 'linux'].contains(host_machine.system()) @@ -669,7 +672,6 @@ if has_mako.returncode() != 0 error('Python (2.x) mako module required to build mesa.') endif -cc = meson.get_compiler('c') if cc.get_id() == 'gcc' and cc.version().version_compare('< 4.4.6') error('When using GCC, version 4.4.6 or later is required.') endif @@ -749,7 +751,6 @@ if cc.has_argument('-fvisibility=hidden') endif # Check for generic C++ arguments -cpp = meson.get_compiler('cpp') cpp_args = [] foreach a : ['-Wall', '-fno-math-errno', '-fno-trapping-math', '-Qunused-arguments'] -- cgit v1.2.3