From 48e2e4140b8e5aacdfd107a1215f21c9632c81c8 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 22 Aug 2016 12:55:21 +0200
Subject: Cache process_path, use fallback search directory for binutils

---
 build2/cxx/init.cxx | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'build2/cxx')

diff --git a/build2/cxx/init.cxx b/build2/cxx/init.cxx
index 14134f1..7d64975 100644
--- a/build2/cxx/init.cxx
+++ b/build2/cxx/init.cxx
@@ -121,16 +121,17 @@ namespace build2
 
           // Note: some overridable, some not.
           //
-          v.insert<path>     ("config.cxx",          true),
-          v.insert<strings>  ("config.cxx.poptions", true),
-          v.insert<strings>  ("config.cxx.coptions", true),
-          v.insert<strings>  ("config.cxx.loptions", true),
-          v.insert<strings>  ("config.cxx.libs",     true),
-
-          v.insert<strings>  ("cxx.poptions"),
-          v.insert<strings>  ("cxx.coptions"),
-          v.insert<strings>  ("cxx.loptions"),
-          v.insert<strings>  ("cxx.libs"),
+          v.insert<path>    ("config.cxx",          true),
+          v.insert<strings> ("config.cxx.poptions", true),
+          v.insert<strings> ("config.cxx.coptions", true),
+          v.insert<strings> ("config.cxx.loptions", true),
+          v.insert<strings> ("config.cxx.libs",     true),
+
+          v.insert<process_path> ("cxx.path"),
+          v.insert<strings>      ("cxx.poptions"),
+          v.insert<strings>      ("cxx.coptions"),
+          v.insert<strings>      ("cxx.loptions"),
+          v.insert<strings>      ("cxx.libs"),
 
           v["cc.poptions"],
           v["cc.coptions"],
-- 
cgit v1.1