From d68ffa9446c6f05ae3bbb92b7b8136450e6dc94d Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 26 Jan 2017 13:24:03 +0000 Subject: scons: always set __STDC_*_MACROS for C++ sources Analogous to previous commit - just set the lot once throughout. Cc: Jose Fonseca Signed-off-by: Emil Velikov Reviewed-by: Eric Engestrom Reviewed-by: Jose Fonseca --- scons/gallium.py | 3 ++- scons/llvm.py | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'scons') diff --git a/scons/gallium.py b/scons/gallium.py index 767766fd6fe..64dfdcc9d56 100755 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -291,8 +291,9 @@ def generate(env): # C preprocessor options cppdefines = [] cppdefines += [ - '__STDC_LIMIT_MACROS', '__STDC_CONSTANT_MACROS', + '__STDC_FORMAT_MACROS', + '__STDC_LIMIT_MACROS', 'HAVE_NO_AUTOCONF', ] if env['build'] in ('debug', 'checked'): diff --git a/scons/llvm.py b/scons/llvm.py index 2d0f05b0279..ec816e8a577 100644 --- a/scons/llvm.py +++ b/scons/llvm.py @@ -100,8 +100,6 @@ def generate(env): env.Prepend(CPPPATH = [os.path.join(llvm_dir, 'include')]) env.AppendUnique(CPPDEFINES = [ - '__STDC_LIMIT_MACROS', - '__STDC_CONSTANT_MACROS', 'HAVE_STDINT_H', ]) env.Prepend(LIBPATH = [os.path.join(llvm_dir, 'lib')]) -- cgit v1.2.3