panfrost: add missing dependency on midgard_pack.h

[mesa.git] / scons / gallium.py

diff --git a/scons/gallium.py b/scons/gallium.py
index b216304170f5ebe8c6a175bb36efbe6f18632939..ea212d15a95714356e3aa6c97faa9ce310f635cf 100755 (executable)
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -381,6 +381,9 @@ def generate(env):
         if check_header(env, 'sys/shm.h'):
             cppdefines += ['HAVE_SYS_SHM_H']
 
+        if check_functions(env, ['strtok_r']):
+            cppdefines += ['HAVE_STRTOK_R']
+
         #FIXME: we should really be checking for the major()/minor()
         # functions/macros in these headers, but check_functions()'s
         # SConf.CheckFunc() doesn't seem to support macros.
@@ -488,8 +491,11 @@ def generate(env):
             '-Werror=missing-prototypes',
             '-Werror=return-type',
             '-Werror=incompatible-pointer-types',
-            '-std=gnu99',
         ]
+        if platform == 'darwin' and host_platform.mac_ver()[0] >= '10.15':
+            cflags += ['-std=gnu11']
+        else:
+            cflags += ['-std=gnu99']
     if icc:
         cflags += [
             '-std=gnu99',