diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2013-02-10 14:08:53 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2013-02-10 14:08:53 +0200 |
| commit | a2845b491ba9bd0c2159140271d28dd055fe3f3e (patch) | |
| tree | bc40ab0bb135aa628e764eee6914c26557497403 /generators.py | |
| parent | aad3a7a76ea9c38b4f954fe9768174ac6065af35 (diff) | |
| download | meson-a2845b491ba9bd0c2159140271d28dd055fe3f3e.zip meson-a2845b491ba9bd0c2159140271d28dd055fe3f3e.tar.gz meson-a2845b491ba9bd0c2159140271d28dd055fe3f3e.tar.bz2 | |
Tests can now be easily run with both shell and Ninja.
Diffstat (limited to 'generators.py')
| -rwxr-xr-x | generators.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/generators.py b/generators.py index edc3176..ea45352 100755 --- a/generators.py +++ b/generators.py @@ -596,6 +596,8 @@ echo Run compile.sh before this or bad things will happen. linker = self.build.compilers[0] # Fixme. commands = [] commands += linker.get_exelist() + if isinstance(target, interpreter.StaticLibrary): + commands += linker.get_std_link_flags() commands += linker.get_output_flags() commands.append(outname) commands += obj_list @@ -605,7 +607,7 @@ echo Run compile.sh before this or bad things will happen. commands += linker.get_std_shared_lib_link_flags() commands += linker.get_pic_flags() elif isinstance(target, interpreter.StaticLibrary): - commands += linker.get_std_link_flags() + pass else: raise RuntimeError('Unknown build target type.') for dep in target.get_external_deps(): |