From 2e4b1fd404926e50434562469b91348cfb27847e Mon Sep 17 00:00:00 2001 From: Tanzinul Islam Date: Wed, 25 Nov 2020 15:41:18 +0000 Subject: [PATCH 1/2] Don't add address model in Embarcadero toolset name None of the other toolset names include a 32/64-bit indicator. Also, there is little danger of mixing object files compiled with both the classic and Clang-based Embarcadero compilers, as the linker now [warns about it][1]. [1]: https://blogs.embarcadero.com/issues-mixing-classic-and-clang-objects-linker-warnings-improving-app-stability/ --- include/boost/config/auto_link.hpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/include/boost/config/auto_link.hpp b/include/boost/config/auto_link.hpp index 1ea6faa7..e48d2902 100644 --- a/include/boost/config/auto_link.hpp +++ b/include/boost/config/auto_link.hpp @@ -190,11 +190,7 @@ BOOST_LIB_SUFFIX: Static/import libraries extension (".lib", ".a") for the c # elif defined(BOOST_EMBTC_WINDOWS) // Embarcadero Clang based compilers: -# if defined(BOOST_EMBTC_WIN32C) -# define BOOST_LIB_TOOLSET "bcb32" -# elif defined(BOOST_EMBTC_WIN64) -# define BOOST_LIB_TOOLSET "bcb64" -# endif +# define BOOST_LIB_TOOLSET "bcb" # elif defined(BOOST_BORLANDC) From 0e80afa323624694e78cba90b0b73b4d9729c5a2 Mon Sep 17 00:00:00 2001 From: Tanzinul Islam Date: Wed, 25 Nov 2020 18:43:34 +0000 Subject: [PATCH 2/2] Change toolset name to embtc --- include/boost/config/auto_link.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/config/auto_link.hpp b/include/boost/config/auto_link.hpp index e48d2902..78abce6a 100644 --- a/include/boost/config/auto_link.hpp +++ b/include/boost/config/auto_link.hpp @@ -190,7 +190,7 @@ BOOST_LIB_SUFFIX: Static/import libraries extension (".lib", ".a") for the c # elif defined(BOOST_EMBTC_WINDOWS) // Embarcadero Clang based compilers: -# define BOOST_LIB_TOOLSET "bcb" +# define BOOST_LIB_TOOLSET "embtc" # elif defined(BOOST_BORLANDC)