diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2013-02-10 13:56:29 +0200 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2013-02-10 13:56:29 +0200 |
commit | aad3a7a76ea9c38b4f954fe9768174ac6065af35 (patch) | |
tree | 367630942ce0d0fefcbbe42da5d69ec9eaff90e8 /generators.py | |
parent | 2772a4cbdf72f11146cff2711feb2fe94cc35f6a (diff) | |
download | meson-aad3a7a76ea9c38b4f954fe9768174ac6065af35.zip meson-aad3a7a76ea9c38b4f954fe9768174ac6065af35.tar.gz meson-aad3a7a76ea9c38b4f954fe9768174ac6065af35.tar.bz2 |
Added test for external deps and fixed comments at the same time.
Diffstat (limited to 'generators.py')
-rwxr-xr-x | generators.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generators.py b/generators.py index f23ec20..edc3176 100755 --- a/generators.py +++ b/generators.py @@ -596,6 +596,9 @@ echo Run compile.sh before this or bad things will happen. linker = self.build.compilers[0] # Fixme. commands = [] commands += linker.get_exelist() + commands += linker.get_output_flags() + commands.append(outname) + commands += obj_list if isinstance(target, interpreter.Executable): commands += linker.get_std_exe_link_flags() elif isinstance(target, interpreter.SharedLibrary): @@ -607,9 +610,6 @@ echo Run compile.sh before this or bad things will happen. raise RuntimeError('Unknown build target type.') for dep in target.get_external_deps(): commands += dep.get_link_flags() - commands += linker.get_output_flags() - commands.append(outname) - commands += obj_list commands += self.build_target_link_arguments(target.get_dependencies()) quoted = shell_quote(commands) outfile.write('\necho Linking \\"%s\\".\n' % target.get_basename()) |