C: Run C.Toolchain automatically if C.TOOLCHAIN is specified on the c…

…ommand-line
jamplus · Feb 6, 2017 · 797095f · 797095f
1 parent 2f7b114
commit 797095f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/bin/Jambase.jam b/bin/Jambase.jam
@@ -863,6 +863,12 @@ rule WorkspaceConfig WORKSPACE_NAME : CONFIG_NAME : ACTUAL_CONFIG_NAME : COMMAND
 	C.CONFIG ?= $(CONFIG) ;
 	C.PLATFORM ?= $(PLATFORM) ;
 	C.COMPILER ?= $(COMPILER) ;
+
+	C.TOOLCHAIN ?= $(c.toolchain) ;
+	if $(C.TOOLCHAIN)
+	{
+		C ;
+	}
 }
 
 JAMFILE.LUA ?= Jamfile.lua ;

diff --git a/bin/modules/c.jam b/bin/modules/c.jam
@@ -41,7 +41,7 @@ rule C.ActiveTarget TARGET {
 	# C.ACTIVE_TOOLCHAIN_* = <win32/debug>C.*
 	C.ACTIVE_TOOLCHAIN_* = @(C.*:G=$(C.ACTIVE_TOOLCHAIN_GRIST)) ;
 
-	if ! $(ALL_SUBDIR_TOKENS) {
+	if ! $(ALL_SUBDIR_TOKENS)  &&  $(TARGET) != C.* {
 		SubDir TOP ;
 	}
 

diff --git a/bin/scripts/DumpJamTargetInfo.jam b/bin/scripts/DumpJamTargetInfo.jam
@@ -1,4 +1,7 @@
-C ;
+if ! [ RuleExists C.Toolchain ]
+{
+	C ;
+}
 
 JAM_MODULES_PATH += $(JAMFILE_ROOT) ;