|
@@ -24,7 +24,8 @@ http://autobuild.buildroot.net/results/c17/c17bbb12d9deadd64a441b36e324cfbbe8aba
|
|
|
Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
|
|
|
[Updated for 0.57.1 - get_builtin_option() vs. get_option(OptionKey())]
|
|
|
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
|
|
-[Bernd: rebased for 1.6.0 & 1.7.0]
|
|
|
+[Bernd: rebased for 1.6.0 & 1.7.0
|
|
|
+ for 1.82.0 - get_option -> optstore.get_value_for]
|
|
|
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
|
|
---
|
|
|
mesonbuild/compilers/mixins/clike.py | 3 +++
|
|
@@ -42,11 +43,11 @@ index 09ad837b1..b7f6b9f22 100644
|
|
|
from .. import compilers
|
|
|
from ..compilers import CompileCheckMode
|
|
|
from .visualstudio import VisualStudioLikeCompiler
|
|
|
-@@ -1053,6 +1053,9 @@ class CLikeCompiler(Compiler):
|
|
|
+@@ -1053,6 +1054,9 @@ class CLikeCompiler(Compiler):
|
|
|
# TI C28x compilers can use both extensions for static or dynamic libs.
|
|
|
stlibext = ['a', 'lib']
|
|
|
shlibext = ['dll', 'so']
|
|
|
-+ elif env.coredata.get_option(OptionKey('default_library')) == 'static':
|
|
|
++ elif env.coredata.optstore.get_value_for(OptionKey('default_library')) == 'static':
|
|
|
+ # Linux/BSDs
|
|
|
+ shlibext = ['a']
|
|
|
else:
|