summaryrefslogtreecommitdiff
path: root/scons
diff options
context:
space:
mode:
authorEmil Velikov <emil.velikov@collabora.com>2017-01-26 13:24:03 +0000
committerEmil Velikov <emil.l.velikov@gmail.com>2017-01-27 17:56:57 +0000
commitd68ffa9446c6f05ae3bbb92b7b8136450e6dc94d (patch)
treea46e9fc80c0e682e86267162ba0c879fc93ad74e /scons
parent13e2928d57fc974158dd3e5cf74ac32dfa8ca622 (diff)
scons: always set __STDC_*_MACROS for C++ sources
Analogous to previous commit - just set the lot once throughout. Cc: Jose Fonseca <jfonseca@vmware.com> Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Diffstat (limited to 'scons')
-rwxr-xr-xscons/gallium.py3
-rw-r--r--scons/llvm.py2
2 files changed, 2 insertions, 3 deletions
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')])