From 4fbb42da96c25002a6170a4bca4e8f4eb7f2b94e Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sat, 29 Dec 2012 22:04:24 +0200 Subject: Can link executables. --- shellgenerator.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'shellgenerator.py') diff --git a/shellgenerator.py b/shellgenerator.py index 36dce31e6..60ece2637 100755 --- a/shellgenerator.py +++ b/shellgenerator.py @@ -46,7 +46,8 @@ class ShellGenerator(): abs_src = os.path.join(self.environment.get_source_dir(), src) abs_obj = os.path.join(self.environment.get_build_dir(), src) abs_obj += '.' + self.environment.get_object_suffix() - commands = compiler.get_exelist() + commands = [] + commands += compiler.get_exelist() commands += compiler.get_debug_flags() commands += compiler.get_std_warn_flags() commands += compiler.get_compile_only_flags() @@ -54,11 +55,20 @@ class ShellGenerator(): commands += compiler.get_output_flags() commands.append(abs_obj) quoted = environment.shell_quote(commands) + ['\n'] + outfile.write('\necho Compiling %s\n' % src) outfile.write(' '.join(quoted)) return abs_obj def generate_exe_link(self, outfile, outname, obj_list): - outfile.write('Linking %s with files %s.\n' % (outname, ' '.join(obj_list))) + linker = self.interpreter.compilers[0] # Fixme. + commands = [] + commands += linker.get_exelist() + commands += obj_list + commands += linker.get_output_flags() + commands.append(outname) + quoted = environment.shell_quote(commands) + ['\n'] + outfile.write('\necho Linking %s.\n' % outname) + outfile.write(' '.join(quoted)) def generate_commands(self, outfile): for i in self.interpreter.get_executables().items(): -- cgit v1.2.3