From acdcc228c252e2a0a90a8586c5b5c6984332635b Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 26 Jul 2018 09:30:11 +0200
Subject: Pass extension supplied by rule to target type default extension
 function

Also revert the precedence back to target type over rule. But now the target
type is able to customize this logic (see exe{} for a use case).
---
 build2/target.hxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'build2/target.hxx')

diff --git a/build2/target.hxx b/build2/target.hxx
index aad5331..0f8c8ea 100644
--- a/build2/target.hxx
+++ b/build2/target.hxx
@@ -1713,7 +1713,7 @@ namespace build2
   //
   template <const char* var, const char* def>
   optional<string>
-  target_extension_var (const target_key&, const scope&, bool);
+  target_extension_var (const target_key&, const scope&, const char*, bool);
 
   template <const char* var, const char* def>
   bool
@@ -1722,12 +1722,12 @@ namespace build2
   // Always return NULL extension.
   //
   optional<string>
-  target_extension_null (const target_key&, const scope&, bool);
+  target_extension_null (const target_key&, const scope&, const char*, bool);
 
   // Assert if called.
   //
   optional<string>
-  target_extension_assert (const target_key&, const scope&, bool);
+  target_extension_assert (const target_key&, const scope&, const char*, bool);
 
   // Target print functions.
   //
-- 
cgit v1.1