Skip to content

Commit fffdea1

Browse files
Update GetBoostLibB2Args.cmake
Use default gcc or clang toolset.
1 parent d08069e commit fffdea1

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

cmake/GetBoostLibB2Args.cmake

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,16 @@ function(get_boots_lib_b2_args)
7171
else()
7272
list(APPEND b2Args cxxflags=-fPIC cxxflags=-std=c++11)
7373
# Need to configure the toolset based on whatever version CMAKE_CXX_COMPILER is
74-
string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" ToolsetVer "${CMAKE_CXX_COMPILER_VERSION}")
74+
# string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" ToolsetVer "${CMAKE_CXX_COMPILER_VERSION}")
7575
if(CMAKE_CXX_COMPILER_ID MATCHES "^(Apple)?Clang$")
76-
list(APPEND b2Args toolset=clang-${ToolsetVer})
76+
# list(APPEND b2Args toolset=clang-${ToolsetVer})
77+
list(APPEND b2Args toolset=clang)
7778
if(HAVE_LIBC++)
7879
list(APPEND b2Args cxxflags=-stdlib=libc++ linkflags=-stdlib=libc++)
7980
endif()
8081
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
81-
list(APPEND b2Args toolset=gcc-${ToolsetVer})
82+
# list(APPEND b2Args toolset=gcc-${ToolsetVer})
83+
list(APPEND b2Args toolset=gcc)
8284
endif()
8385
endif()
8486
endif()

0 commit comments

Comments
 (0)