diff options
| author | Dylan Baker <[email protected]> | 2018-04-26 10:20:57 -0700 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2018-04-27 10:24:51 -0700 |
| commit | 7772de5283cf30b06e75f9e4914a75f54ca37564 (patch) | |
| tree | 765ff2fdb16e8233f54692532a8a9fb98c059b90 /src/intel/vulkan | |
| parent | 0c23bd76d1f494956996d8c0d8f7dcdaa8bdc12f (diff) | |
meson: fix race condition revealed by using 0.44
Previously there was a special target that blocked for the generation of
anv_entrypoints.h, with meson 0.44 we don't need this, we can use a new
language feature instead. The problem is that previously that blocking
target would hide a race condition for the generation of another header,
anv_extensions.h. Now the build sometimes fails when anv_extensions.h is
not generated in time.
v2: - clarify the race condition in the commit message (Emil)
CC: Mark Janes <[email protected]>
Fixes: 92550d9b16d2b295bdac087f31b1fd6d0f808e02
("meson: remove workaround for custom target creating .h and .c files")
Signed-off-by: Dylan Baker <[email protected]>
Reviewed-by: Scott D Phillips <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/intel/vulkan')
| -rw-r--r-- | src/intel/vulkan/meson.build | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build index 06acc78391f..f20a8a54c9b 100644 --- a/src/intel/vulkan/meson.build +++ b/src/intel/vulkan/meson.build @@ -1,4 +1,4 @@ -# Copyright © 2017 Intel Corporation +# Copyright © 2017-2018 Intel Corporation # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -96,7 +96,7 @@ foreach g : [['70', ['gen7_cmd_buffer.c']], ['75', ['gen7_cmd_buffer.c']], _gen = g[0] libanv_gen_libs += static_library( 'libanv_gen@0@'.format(_gen), - [anv_gen_files, g[1], anv_entrypoints[0]], + [anv_gen_files, g[1], anv_entrypoints[0], anv_extensions_h], include_directories : [ inc_common, inc_compiler, inc_drm_uapi, inc_intel, inc_vulkan_util, inc_vulkan_wsi, @@ -220,7 +220,7 @@ if with_tests 'anv_@0@'.format(t), executable( t, - ['tests/@[email protected]'.format(t), anv_entrypoints[0]], + ['tests/@[email protected]'.format(t), anv_entrypoints[0], anv_extensions_h], link_with : libvulkan_intel_test, dependencies : [dep_libdrm, dep_thread, dep_m, dep_valgrind], include_directories : [ |