Mesa (master): Scons: check for timespec_get on windows as well as unices

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Feb 1 19:51:50 UTC 2021


Module: Mesa
Branch: master
Commit: abdaf5fab82c7d74c036cf576b012b71fcab705e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=abdaf5fab82c7d74c036cf576b012b71fcab705e

Author: Dylan Baker <dylan.c.baker at intel.com>
Date:   Wed Jan 20 09:16:27 2021 -0800

Scons: check for timespec_get on windows as well as unices

windows has a timespec_get function, and if we don't check that then it
will try to fall back to using clock_gettime, which windows doesn't
have.

Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8592>

---

 scons/gallium.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scons/gallium.py b/scons/gallium.py
index 03d11e440a1..63accb143a5 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -340,6 +340,10 @@ def generate(env):
         cppdefines += ['NDEBUG']
     if env['build'] == 'profile':
         cppdefines += ['PROFILE']
+
+    if check_functions(env, ['timespec_get']):
+        cppdefines += ['HAVE_TIMESPEC_GET']
+
     if env['platform'] in ('posix', 'linux', 'freebsd', 'darwin'):
         cppdefines += [
             '_POSIX_SOURCE',
@@ -374,9 +378,6 @@ def generate(env):
         if check_functions(env, ['random_r']):
             cppdefines += ['HAVE_RANDOM_R']
 
-        if check_functions(env, ['timespec_get']):
-            cppdefines += ['HAVE_TIMESPEC_GET']
-
         if check_header(env, 'sys/shm.h'):
             cppdefines += ['HAVE_SYS_SHM_H']
 



More information about the mesa-commit mailing list