OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7ea4e43
)
meson: fix libatomic tests
author
Dylan Baker
<dylan@pnwbakers.com>
Fri, 9 Nov 2018 20:56:00 +0000
(12:56 -0800)
committer
Emil Velikov
<emil.l.velikov@gmail.com>
Wed, 14 Nov 2018 18:53:02 +0000
(18:53 +0000)
There are two problems:
1) the extra underscore in MISSING_64BIT_ATOMICS
2) we should link with libatomic if the previous test decided we needed
it
Fixes:
d1992255bb29054fa51763376d125183a9f602f3
("meson: Add build Intel "anv" vulkan driver")
Reviewed-and-Tested-by: Matt Turner <mattst88@gmail.com>
(cherry picked from commit
4eab98b66e7dc495f26ac3b0e356e405c0796b74
)
meson.build
patch
|
blob
|
history
diff --git
a/meson.build
b/meson.build
index
dabfb9a
..
58ff3ea
100644
(file)
--- a/
meson.build
+++ b/
meson.build
@@
-905,8
+905,9
@@
if not cc.links('''#include <stdint.h>
int main() {
return __sync_add_and_fetch(&v, (uint64_t)1);
}''',
+ dependencies : dep_atomic,
name : 'GCC 64bit atomics')
- pre_args += '-DMISSING_64
_
BIT_ATOMICS'
+ pre_args += '-DMISSING_64BIT_ATOMICS'
endif
# TODO: shared/static? Is this even worth doing?