diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-12-07 12:06:59 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-12-07 12:06:59 +0200 |
| commit | a89f1e4f4efd291beedea03c65c8185b7d0df20e (patch) | |
| tree | d06b2cb81720ae0c6cc877c2c67201838a10b63a /build2/search.cxx | |
| parent | c2da5df68610a0070575212bfee67c730ab39128 (diff) | |
Distinguish between "fixed" and "default" target extensions
This fixes wrong merging of, say, file{README} and file{README.MySQL}
(in libmysqlclient).
Diffstat (limited to 'build2/search.cxx')
| -rw-r--r-- | build2/search.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/build2/search.cxx b/build2/search.cxx index a7d40c6..f0b163a 100644 --- a/build2/search.cxx +++ b/build2/search.cxx @@ -102,7 +102,9 @@ namespace build2 if (!ext) { - if (auto f = ctk.type->extension) + if (auto f = ctk.type->fixed_extension) + ext = f (ctk); + else if (auto f = ctk.type->default_extension) ext = f (ctk, *s, true); if (!ext) |