From f7a4bae651c8c045dd4b0e79cb719e4a81503b2d Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Tue, 11 Oct 2005 13:32:32 +0000
Subject: [PATCH] Turn off inlining unconditionally to avoid codegen bugs

[SVN r31281]
---
 src/tools/borland.jam | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/tools/borland.jam b/src/tools/borland.jam
index 57798f0f7..6b7a5e5ef 100644
--- a/src/tools/borland.jam
+++ b/src/tools/borland.jam
@@ -63,9 +63,16 @@ flags borland.compile OPTIONS <optimization>off : -Od ;
 flags borland.compile OPTIONS <optimization>speed : -O2 ;
 flags borland.compile OPTIONS <optimization>space : -O1 ;
 
-flags borland CFLAGS <inlining>off : -vi- ;
-flags borland CFLAGS <inlining>on : -vi -w-inl ;
-flags borland CFLAGS <inlining>full : -vi -w-inl ;
+if $(.BORLAND_HAS_FIXED_INLINING_BUGS)
+{
+    flags borland CFLAGS <inlining>off : -vi- ;
+    flags borland CFLAGS <inlining>on : -vi -w-inl ;
+    flags borland CFLAGS <inlining>full : -vi -w-inl ;
+}
+else
+{
+    flags borland CFLAGS : -vi- ;
+}
 
 flags borland.compile OPTIONS <warnings>off : -w- ;
 flags borland.compile OPTIONS <warnings>all : -w ;