From 8a675ca3967820c74a5de0feca23cc6eba3e72ee Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@gmail.com>
Date: Sat, 12 Feb 2022 01:09:29 +0200
Subject: [PATCH] msvc.jam: put user-supplied <cflags> and <cxxflags> last;
 support <compileflags>. Closes #137. Refs #118.

---
 src/tools/msvc.jam | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/tools/msvc.jam b/src/tools/msvc.jam
index 685af85fa..cf6cc7a95 100644
--- a/src/tools/msvc.jam
+++ b/src/tools/msvc.jam
@@ -1779,7 +1779,7 @@ local rule default-path ( version )
 rule get-rspline ( target : lang-opt lang-flags )
 {
     CC_RSPLINE on $(target) = [ on $(target) return $(lang-opt) -U$(UNDEFS)
-        $($(lang-flags)) $(OPTIONS) -D$(DEFINES)
+        $($(lang-flags)) $(OPTIONS) $(USER_COMPILEFLAGS) $(USER_$(lang-flags)) -D$(DEFINES)
         \"-I$(INCLUDES:W)\" \"-FI$(FORCE_INCLUDES:W)\" ] ;
 }
 
@@ -1956,8 +1956,9 @@ local rule register-toolset-really ( )
     toolset.flags msvc.compile OPTIONS <runtime-debugging>off/<runtime-link>static/<threading>multi : /MT ;
     toolset.flags msvc.compile OPTIONS <runtime-debugging>on/<runtime-link>static/<threading>multi : /MTd ;
 
-    toolset.flags msvc.compile CFLAGS <cflags> : ;
-    toolset.flags msvc.compile.c++ C++FLAGS <cxxflags> : ;
+    toolset.flags msvc.compile USER_CFLAGS <cflags> : ;
+    toolset.flags msvc.compile.c++ USER_C++FLAGS <cxxflags> : ;
+    toolset.flags msvc.compile.c++ USER_COMPILEFLAGS <compileflags> : ;
 
     toolset.flags msvc.compile PDB_CFLAG <debug-symbols>on/<debug-store>database : /Fd ;