projects
/
platform
/
upstream
/
automake.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'micro' into maint
[platform/upstream/automake.git]
/
bin
/
automake.in
diff --git
a/bin/automake.in
b/bin/automake.in
index
40b3181
..
283d1bb
100644
(file)
--- a/
bin/automake.in
+++ b/
bin/automake.in
@@
-1481,10
+1481,11
@@
sub handle_languages ()
# If the project is entirely C++ or entirely Fortran 77 (i.e., 1
# suffix rule was learned), don't bother with the C stuff. But if
# anything else creeps in, then use it.
# If the project is entirely C++ or entirely Fortran 77 (i.e., 1
# suffix rule was learned), don't bother with the C stuff. But if
# anything else creeps in, then use it.
- $needs_c = 1
- if $need_link || suffix_rules_count > 1;
-
- if ($needs_c)
+ my @languages_seen = map { $languages{$extension_map{$_}}->name }
+ (keys %extension_seen);
+ @languages_seen = uniq (@languages_seen);
+ $needs_c = 1 if @languages_seen > 1;
+ if ($need_link || $needs_c)
{
define_compiler_variable ($languages{'c'})
unless defined $done{$languages{'c'}};
{
define_compiler_variable ($languages{'c'})
unless defined $done{$languages{'c'}};