From 289cf16bf2ecce24527243e9d024239e9952594b Mon Sep 17 00:00:00 2001
From: Edward Diener <eldiener@tropicsoft.com>
Date: Sat, 28 Mar 2020 22:39:02 -0400
Subject: [PATCH] Embarcadero C++ clang-based compilers only support C++17, so
 cxxstd is turned off for all levels. (#559)

Co-authored-by: Edward Diener <eldlistmailingz@tropicsoft.com>
---
 src/tools/embarcadero.jam | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/tools/embarcadero.jam b/src/tools/embarcadero.jam
index bce2af574..8982704ad 100644
--- a/src/tools/embarcadero.jam
+++ b/src/tools/embarcadero.jam
@@ -158,6 +158,26 @@ toolset.inherit-flags embarcadero
       <target-os>windows/<runtime-link>static
       <target-os>windows/<runtime-link>shared
       <rtti>off
+      <cxxstd>98
+      <cxxstd>03
+      <cxxstd>0x
+      <cxxstd>11
+      <cxxstd>1y
+      <cxxstd>14
+      <cxxstd>1z
+      <cxxstd>17
+      <cxxstd>2a
+      <cxxstd>latest
+      <cxxstd>98/<cxxstd-dialect>iso
+      <cxxstd>03/<cxxstd-dialect>iso
+      <cxxstd>0x/<cxxstd-dialect>iso
+      <cxxstd>11/<cxxstd-dialect>iso
+      <cxxstd>1y/<cxxstd-dialect>iso
+      <cxxstd>14/<cxxstd-dialect>iso
+      <cxxstd>1z/<cxxstd-dialect>iso
+      <cxxstd>17/<cxxstd-dialect>iso
+      <cxxstd>2a/<cxxstd-dialect>iso
+      <cxxstd>latest/<cxxstd-dialect>iso
     ;
 
 if [ MATCH (--debug-configuration) : [ modules.peek : ARGV ] ] {
@@ -231,7 +251,6 @@ rule init ( version ? :  command * : options * )
     
       local condition = [ common.check-init-parameters embarcadero : version $(version) ] ;
       handle-options $(condition) : $(command) : $(options) ;
-      clang.init-cxxstd-flags embarcadero : $(condition) : $(cl_version) ;
     
       # Support for the Embarcadero root directory. If the Embarcadero binary
       # directory is not in the PATH we need to tell the underlying clang