diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-01-10 19:38:58 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-15 15:53:29 +0200 |
| commit | 7299c4d24b98b92c8bb9d17d146b46777ab12953 (patch) | |
| tree | 7b56f0e5205cf0b6825765bd1e5f844c28db895c /bin | |
| parent | 5b40c4e744ddd42ab823f0938bb9d96b34aec58e (diff) | |
| download | automake-7299c4d24b98b92c8bb9d17d146b46777ab12953.tar.gz | |
depend: assume we can always pass '-o' to the C compiler
This is the case after the change in commit v1.13.1-56-g34001a9 of
2013-01-09 (compile: use 'compile' script when "-c -o" is used with
losing compilers).
This is just a simplification; no semantic changes are intended.
* bin/automake.in (handle_languages): Drop transform '%-o%', and
definitions of '$output_flag'.
* lib/am/depend2.am: Adjust to just assume the '?-o?' transform is
true, and the '%-o%' transform expands to "-o".
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/automake.in | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/bin/automake.in b/bin/automake.in index 63e5962f4..df6560d3a 100644 --- a/bin/automake.in +++ b/bin/automake.in @@ -1296,12 +1296,6 @@ sub handle_languages () if (((! option 'no-dependencies') && $lang->autodep ne 'no') || defined $lang->compile) { - # Some C compilers don't support -c -o. Use it only if really - # needed. - my $output_flag = $lang->output_flag || ''; - $output_flag = '-o' - if (! $output_flag && $lang->name eq 'c'); - # Compute a possible derived extension. # This is not used by depend2.am. my $der_ext = ($lang->output_extensions->($ext))[0]; @@ -1330,7 +1324,7 @@ sub handle_languages () COMPILE => '$(' . $lang->compiler . ')', LTCOMPILE => '$(LT' . $lang->compiler . ')', - -o => $output_flag); + ); } # Now include code for each specially handled object with this @@ -1374,9 +1368,6 @@ sub handle_languages () "\$(LIBTOOL) $ltverbose $libtool_tag\$($ptltflags) \$(LIBTOOLFLAGS) " . "--mode=compile $obj_compile"; - # We _need_ '-o' for per object rules. - my $output_flag = $lang->output_flag || '-o'; - $output_rules .= file_contents ($rule_file, new Automake::Location, @@ -1398,7 +1389,6 @@ sub handle_languages () SILENT => $silent, COMPILE => $obj_compile, LTCOMPILE => $obj_ltcompile, - -o => $output_flag, %file_transform); } |