diff --git a/Jamfile b/Jamfile
index d762eb8c1b..94d45d64b5 100644
--- a/Jamfile
+++ b/Jamfile
@@ -192,12 +192,6 @@ rule linking ( properties * )
 		result += <visibility>hidden ;
 	}
 
-	if <toolset>msvc in $(properties)
-	{
-		# ask the compiler to correctly set __cplusplus version
-		result += <msvc-version-macro>on ;
-	}
-
 	if <boost-link>static in $(properties)
 	{
 		if <link>shared in $(properties)
@@ -361,6 +355,12 @@ rule building ( properties * )
 			# https://learn.microsoft.com/en-us/cpp/build/reference/permissive-standards-conformance?view=msvc-170
 			result += <cxxflags>/permissive- ;
 		}
+
+		# ask the compiler to correctly set __cplusplus version
+		if <toolset>msvc in $(properties)
+		{
+			result += <msvc-version-macro>on ;
+		}
 	}
 
 
@@ -692,8 +692,8 @@ feature export-extra : off on : composite propagated ;
 # symbol table reasonably small
 feature.compose <export-extra>on : <define>TORRENT_EXPORT_EXTRA ;
 
-# ask the compiler to correctly set __cplusplus version
 feature msvc-version-macro : off on : composite propagated link-incompatible ;
+# ask the compiler to correctly set __cplusplus version
 feature.compose <msvc-version-macro>on : <cxxflags>/Zc\:__cplusplus ;
 
 lib advapi32 : : <name>advapi32 ;