@@ -6,7 +6,7 @@ cpu_family = target_machine.cpu_family()
6
6
7
7
vkd3d_compiler = meson .get_compiler(' c' )
8
8
vkd3d_is_msvc = vkd3d_compiler.get_id() == ' msvc' or vkd3d_compiler.get_id() == ' clang-cl'
9
- vkd3d_is_clang = vkd3d_compiler.get_id() == ' clang'
9
+ vkd3d_is_clang = vkd3d_compiler.get_id() == ' clang' or vkd3d_compiler.get_id() == ' clang-cl '
10
10
vkd3d_platform = target_machine .system()
11
11
12
12
vkd3d_buildtype = get_option (' buildtype' )
@@ -122,9 +122,11 @@ if cpu_family == 'x86'
122
122
123
123
# Need to link against libatomic for 64-bit atomic emulation on x86
124
124
# when using clang.
125
- if vkd3d_is_clang
126
- lib_atomic = vkd3d_compiler.find_library (' atomic' )
127
- vkd3d_extra_libs += lib_atomic
125
+ if vkd3d_platform == ' linux'
126
+ if vkd3d_is_clang
127
+ lib_atomic = vkd3d_compiler.find_library (' atomic' )
128
+ vkd3d_extra_libs += lib_atomic
129
+ endif
128
130
endif
129
131
endif
130
132
@@ -146,11 +148,13 @@ if vkd3d_platform == 'windows'
146
148
if vkd3d_compiler.has_link_argument(' -static-libstdc++' )
147
149
add_global_link_arguments (' -static-libstdc++' , language : [ ' cpp' ])
148
150
endif
149
- if vkd3d_compiler.has_link_argument(' /NOIMPLIB' )
150
- add_global_link_arguments (' /NOIMPLIB' , language : [ ' c' , ' cpp' ])
151
- endif
152
- if vkd3d_compiler.has_link_argument(' /NOEXP' )
153
- add_global_link_arguments (' /NOEXP' , language : [ ' c' , ' cpp' ])
151
+ if not vkd3d_is_clang
152
+ if vkd3d_compiler.has_link_argument(' /NOIMPLIB' )
153
+ add_global_link_arguments (' /NOIMPLIB' , language : [ ' c' , ' cpp' ])
154
+ endif
155
+ if vkd3d_compiler.has_link_argument(' /NOEXP' )
156
+ add_global_link_arguments (' /NOEXP' , language : [ ' c' , ' cpp' ])
157
+ endif
154
158
endif
155
159
endif
156
160
0 commit comments