aboutsummaryrefslogtreecommitdiff
path: root/build2/file.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-01-19 16:50:40 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-01-19 16:50:40 +0200
commit5164c843513212ab1ac1f721c4de04b6a865eb0c (patch)
tree1c6b2f440bd6dcd41fed60e76095bae2bf4e9e54 /build2/file.cxx
parent5607313a91e5ca0113b1f8b9acfd02c1fb105346 (diff)
Get rid of extension_pool
Diffstat (limited to 'build2/file.cxx')
-rw-r--r--build2/file.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/build2/file.cxx b/build2/file.cxx
index 9e957a9..2889cf7 100644
--- a/build2/file.cxx
+++ b/build2/file.cxx
@@ -1112,8 +1112,11 @@ namespace build2
{
path n (*tk.dir);
n /= *tk.name;
- if (tk.ext != nullptr)
+ if (tk.ext)
+ {
+ n += '.';
n += *tk.ext;
+ }
process_path pp (process::try_path_search (n, true));
@@ -1126,9 +1129,9 @@ namespace build2
targets.insert<exe> (
tt,
p.directory (),
- dir_path (), // No out (out of project).
+ dir_path (), // No out (out of project).
p.leaf ().base ().string (),
- &extension_pool.find (p.extension ()), // Specified.
+ p.extension (), // Always specified.
trace));
if (t.path ().empty ())