From 63c480abe7755c3c957d5c219a5e0ed3e9f881aa Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sat, 17 Dec 2016 16:09:34 +0200
Subject: Add support for specifying individual paths of imported targets

The new config.import.* variable format is:

config.import.<proj>.<name>[.<type>]

For example:

b config.import.build2.b=/opt/build2/bin/b
b config.import.build2.b.exe=b-boot
---
 build2/cc/compile.cxx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'build2/cc')

diff --git a/build2/cc/compile.cxx b/build2/cc/compile.cxx
index 74a9422..f182408 100644
--- a/build2/cc/compile.cxx
+++ b/build2/cc/compile.cxx
@@ -922,8 +922,7 @@ namespace build2
           //
           dir_path d (f.directory ());
           string n (f.leaf ().base ().string ());
-          const char* es (f.extension ());
-          const string* e (&extension_pool.find (es != nullptr ? es : ""));
+          const string* e (&extension_pool.find (f.extension ()));
 
           // Determine the target type.
           //
-- 
cgit v1.1